Merge changes I4f04b058,Ia2d97568 am: ab8690cfd7 am: 3e85b9ede2 am: b564b1c5c6 am: b99c42f41c am: 8e4d4deaaf

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

Change-Id: I26afbff2b417d56933cf131b896e05b4bbd27d11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>