Merge "fsmgr: support multiple fs-types/mountpoint"