Merge "Fix test-art-(host|target)-run-test(32|64) targets."