Merge "fs_mgr: Add support in fs_mgr_read_fstab_file for /proc/mounts" am: d2f93b17a0
am: 231aeb80f8

Change-Id: If2b4ae597ac3a14dc1a841cc697995ebee3bfcc3