Merge "ART: Add debug code to run-test 913" am: 39d562895a
am: 6c1a074521

Change-Id: I9733cd04cb8ecc12c8068e888b24a5380545534c