Merge "fs_mgr: overlayfs unit test" am: 190fd10913 am: 6ccaed7ccf
am: da8ef82012

Change-Id: I318f609512c7e9203ebea1d0d1c1b9d47185da19