Bug 1019838 - Various non-unified compilation bustage fixes.  r=bustage in a CLOSED TREE