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

* commit '641c83a8645ef9fd99dca06ec30bae8449b959c7':
  Fix test-art-target-sync when ART_TEST_ANDROID_ROOT is used.