Merge "run_build_test_target: Fix run-test not running for art-test[-javac]" am: e81b88f5ee
am: b71ae58ca9

Change-Id: I3c843d3dd11127dde88f35b51693b2a967ed7a70