fix ndk-build error of android-ndk-r9
Merge remote-tracking branch 'origin/master'