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

Change-Id: I29ad46ea487a469ba88ab30eab56a2829449a92d