Merge "Replacing fs_mgr_read_fstab() with new fs_mgr APIs" am: 61f66033d5 am: 5e10463e25
am: 651491544e

Change-Id: If6d476001fb55417adc2aad9075d0c4e8ebbeca1