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

Change-Id: I1aaee10ef2fc1d0880571315151c34af8b12fc10