Merge "adb-remount-test: Refactor restore()"