Merge "ART: Refactor run-test 904" am: c830101281 am: 5d527ceccf am: 40626940cb
am: b4b25cc3bc

Change-Id: I70f0d0292bd7ea7689a3334edf97a8a473cecc2f