Merge "recovery: replacing fs_mgr_read_fstab() with new fs_mgr APIs" am: 7a0dfec771
am: 1a23257214

Change-Id: Ie60bf8b6b9e55c91770df218e02383dc4adb20cd