Merge "Make tests assume ANDROID_ROOT is not /system."