[automerger skipped] Merge "Work around `art-host-tests` build issues when...

[automerger skipped] Merge "Work around `art-host-tests` build issues when using ART prebuilts." into sc-dev am: da8d71ea -s ours

am skip reason: Merged-In I9e885be3c7161f6f09a93b3d32339a5a6e57d2a1 with SHA-1 4d9d0aa8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15402994

Change-Id: Icc9e39f87cee13abf7956d2318e9fd52e9717e21