Merge "fs_mgr: overlayfs: ReadFstabFromFile touches errno" am: b4631fc775
am: 796162d7c5

Change-Id: Ib8275414c7d04bb5c90d78949d7074679a2d0ae1