Merge "Update mainline prebuilts to build 7340791." am: 33e0555d5c am: 23d79f0965

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

Change-Id: Id8c06839ee9e35d38a9510581d499164a912da63