Merge "Another ART_TEST_ANDROID_ROOT fix."