Merge changes I5cd5a29f,I2a68c293 am: 74d0e79948 am: c9a9d5d62c am: 93ee4d9efd am: 6990c266a0

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

Change-Id: Id37cc90c5dc8b0745d6a2c4b0862569a0aa1141f