Merge "fstest: replacing fs_mgr_read_fstab() with fs_mgr_read_fstab_default()" am: 5b88b5289a
am: c2d829fe87

Change-Id: If54dc63b8dbfbfce2413d4afc029f4a79d4dda37