Merge "fs_mgr: overlayfs: test inAdb and inFastboot" am: 42c9e7e393 am: 245ad039f1
am: 4d83ed7e37

Change-Id: I4b9106b21e13b759ce618c2e0729aa41de798b4a