Merge "fs_mgr: overlay backing, force filesystem for f2fs" am: 3b554d3dbf
am: 4244115ebe

Change-Id: Id34e4803f50bda236724d91cd338a058b9829c07