am 661cc989: Merge "Make ART\'s run-test support Dalvik so we can remove dalvik/tests"

* commit '661cc989b99e8eed3929a79aee9e10cfb5aa4f1d':
  Make ART's run-test support Dalvik so we can remove dalvik/tests