Merge "ndk: Fix test-libc++ build with Clang."