Bug 1052358 - Non-unified build bustage fix.  r=bustage in a CLOSED TREE