[Bug 226077] Merge Review: libxkbfile