Re-convert cairo to multiarch.
Fix multiarch merge.
Convert security/mit-krb5 to multiarch.
Merge branch 'joyent/feature/multiarch/2013Q3' into joyent/release/2013Q3