Merge "fs_mgr: fix errno setted by mount_with_alternatives" am: 488525b47b am: 21a33342af
am: 56c920aed9

Change-Id: I12fea4ae42c6c7071355911d968432ce5d4e07ee