Pull repos tested for working unified build.

This will get moved over to Octo Kat after all variants get tested.