Merge "Revert^4 "remove libbinder_ndk_helper_headers"" into main am: a574447447 am: eb5f59f6f6

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

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