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

Change-Id: I014e51bec3d06ccbadd30ae9725156bfa8eb423b