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

Change-Id: Iab318147774203d6613dfd38de4c067117cd133a