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

Change-Id: I10c369c1e1aa159e94863ea22c73c05d542e9b8b