Merge "Fix ndk-build unit test."