Merge "fs_mgr: overlayfs test fix adb_sh" am: c08c8080ef
am: 262a8bba09

Change-Id: Ibc5439e7bbde2826c5194cc45eda46aa4fbc06c2