Merge "Update fs_mgr tests for new fstab format and add to TEST_MAPPING"
am: afa0d88eea

Change-Id: I5ee153fae1ec35c3ee25cee9185f03865e5ffbe7