Merge "adb-remount-test: Refactor fastboot flash vendor test"