Merge changes I5cd5a29f,I2a68c293 am: 74d0e79948

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

Change-Id: I8fee058833115372401fcf3555539e045bb25d96