Fixed build with NDK API level 24 + removed unusued header

Merged Sylvain Berfini requested to merge fix/build_api_24 into master

Merge request reports