Merge "adb-remount-test: Refactor remount RW test"