am 1c75422c: am 1686784a: Merge changes I6bffe1cd,I0984ba01

* commit '1c75422c2144b845412b20c100e3a13cf2704212':
  fs_mgr: split fstab parsing into separate file
  fs_mgr: update ext4_parse_sb to match change in ext4_utils