Merge "adb-remount-test: Refactor raw remount & remount from scratch test"