Merge "ART: Change meaning of run-test's --no-image"
am: b2269c1657

Change-Id: Id19d294fa3a8c366b231d54ea9625163a00937be