Merge "Update mainline prebuilts to build 7229304." am: ebc9db2348 am: a54462cce3

Original change: https://android-review.googlesource.com/c/platform/prebuilts/runtime/+/1650567

Change-Id: I93f08bd08ceb16bad44e6d9452541992818649b2