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