Merge "fs_mgr: overlayfs test fix adb_sh"