Merge "fsmgr: revert multiple fs-types/mountpoint (fix N5 boot)"