Merge "fs_mgr: overlayfs: test inAdb and inFastboot"