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

Change-Id: I125e21aa5419a6f52180fb5f11107339e51156c9