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

Change-Id: Id0f8eaca9877201b9c132cede97c2a7afba13468