Merge "Do not umount /vendor, /system, and /oem even if they are R/W."