Fixed build with NDK r21

Merged Sylvain Berfini requested to merge fix/android_ndk21_build into bc

Merge request reports