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

Change-Id: I6a05638b72328ec75b1080b4f577d77d0166cd32