Merge "libbinder_ndk: split C ABI from C++ API"