Re-convert cairo to multiarch.
Fix multiarch merge.
Convert security/mit-krb5 to multiarch.