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

Change-Id: I5f223563408bc3133e91238ee34894ab13ff4103