Merge "libbinder_ndk: split C ABI from C++ API" am: bbe3d226f5 am: 29815b55ff

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1356964

Change-Id: I646b88c18514eb67d32edaab21c2e74898bf1210