Merge "Revert^4 "remove libbinder_ndk_helper_headers"" into main