Merge "fs_mgr: overlayfs: test inAdb and inFastboot"
am: 42c9e7e393

Change-Id: I9633c1f3e02761ec0237c1c934f409aed07c7dca