Merge "cppreopts: umount_all fstab.postinstall"
am: 69fd1b7267

Change-Id: Ia28e8fe486c90148cba0520e68d6cac2d1f6bcc2