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

Change-Id: I8f61f6db876bf7bb63edf317f7eaa162be853693