add android-ndk
merge