am 7687b250: Merge "ART: Fix run-tests for emulator"

* commit '7687b250a565f465e3222c8b5adda1427f10c5f6':
  ART: Fix run-tests for emulator