Changes to be able to build using NDK 19

Merged Sylvain Berfini requested to merge feature/android_ndk_19 into master

Merge request reports