Merge "Add adb root to test-art-target, required by adb remount."