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

Change-Id: Ib99e6383c3d0a6ff49e7413d31fef9fb8a26f7df