Merge "fs_mgr: use different fstab paths for normal/recovery boot" am: 9c59029add
am: 07052c0509

Change-Id: I63466cb1770c99665fbfc96bd19ab9f770a2e429