Merge "run_build_test_target: Fix run-test not running for art-test[-javac]" am: e81b88f5 am: b71ae58c am: f9ef18c8 am: 3fe77aa7 Change-Id: I014e51bec3d06ccbadd30ae9725156bfa8eb423b