Merge "Switch to fs_mgr_read_fstab("/fstab.device")" am: 4485a7b47d am: 8ecb417ce3
am: 2b0eed2d9c

Change-Id: I27bc2721d1a69c1464fd4984570cdcf270e7fc77