Merge "fs_mgr: overlayfs: test issues with single super device" am: 001c6b9c01
am: 1bbe7c87ee

Change-Id: Ieeaf9cf3a05bfae8bf9b5d850b72ce352bdc1cfb