Merge "ART: Fix run-test invocation for jvm tests"
am: 0b3e830d14

Change-Id: I85889dcb9be158fd8a9628d5b8af3e4def2b9115