Merge "[automerger skipped] Merge "Generate the ART boot image for host as...

Merge "[automerger skipped] Merge "Generate the ART boot image for host as well (used by ART tests)." into rvc-dev am: b3b814cb am: a6f23f43 am: c4a0eef7 -s ours" into rvc-qpr-dev-plus-aosp am: 6653c809 -s ours

am skip reason: Change-Id I864f72198d875dc1421c9c029a683bafbe7b71ac with SHA-1 e920d2d0 is in history

Change-Id: Ib03e8256f536f988d17a83316b8d00afee9ebdee