[2.1.5] Fixing compilation errors when using android-ndk-r9.
[2.1.5] Travis-ci is using android-ndk-r9 now.