Merge "Fix test-art-target-sync when ART_TEST_ANDROID_ROOT is used." am: 763fd2d3d1
am: 74af075f11

* commit '74af075f11e23918edc25c86fb2f1d8209cf94fc':
  Fix test-art-target-sync when ART_TEST_ANDROID_ROOT is used.