Merge "adb-remount-test: Miscellaneous fixes - 2nd round"