am 1686784a: Merge changes I6bffe1cd,I0984ba01

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