Minor changes to build with android-ndk-r8d version
Minor fixes
minor fixes
Merge remote-tracking branch 'origin/master'