Bug 1047483 - Fix Windows non-unified build bustage again.
CLOSED TREE a=RyanVM