Bug 1017323 - Fix some non-unified build bustage