Merge "libnativehelper: Add NDK-only target using libc++"