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

Change-Id: Iefa363ac509a20c63b4c296e8c72bce3615882d8