[automerger skipped] Merge "Revert "Generate the ART boot image for host as...
[automerger skipped] Merge "Revert "Generate the ART boot image for host as well (used by ART tests)."" into rvc-dev am: 999cff9a -s ours am: 37710d6b am: a1587b98
Change-Id: I65ba0986749624c43df4f7286f8908cf4060458c