Merge "ART: Fix run-test"
am: 308640f

* commit '308640fd439f6e0867770d74600ad4d8edda7093':
  ART: Fix run-test