Merge "Fix "adb remount" for when the root directory is in system.img"