Change from back porting for ndk build.