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

Change-Id: I1b7d622f1d518f446301c4467fab72107cc4f171