Merge "Make ART's run-test support Dalvik so we can remove dalvik/tests"