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

* commit '763fd2d3d131898cad6295a19ae9a30e22ce5f2a':
  Fix test-art-target-sync when ART_TEST_ANDROID_ROOT is used.