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

Change-Id: Id3b713b7d132bc1e500a24aa79598350868470d3