Merge "Fix mms-common's pathnames to match package spec."