Merge "Fix test-art-target-sync when ART_TEST_ANDROID_ROOT is used."