Merge "Fix ndk build."