Update changes for ndk build