Merge "fs_mgr: overlayfs support legacy devices (marlin)" am: 4e3a5f61a4
am: 694af77137

Change-Id: I1943fe756f0c8c9ca624008a12a3bc34a05adf0a