Merge changes from topic "libbinder_ndk-remove-cpp-headers" into main am: 56aed2b0 am: 09238923

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3251042



Change-Id: Ia478843b8ea89927d577b903e49c127f2026e0be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>