Merge "Revert^2 "remove libbinder_ndk_helper_headers"" into main am: b2653d0b am: dfe2a277

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



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