Merge "gn2bp: Use AOSP libc and NDK"