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

* commit '86573e568b7ce356d15e4eb3b4af4cf290785c7f':
  ART: Fix run-tests for emulator