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