Bug 1017323 - Fix more non-unified build bustage