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

Change-Id: Ic4d967a22f14e47122bacb3533a3c78a3fd73d9d