Merge "Fix "adb remount" for devices without an oem partition."