Fixed Android build issues

Merged Sylvain Berfini requested to merge fix/android_build into release/4.5

Merge request reports