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

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

Change-Id: If56c671ac673981ebedf643009ce45459722718e