Bug 939608 - Part 1: Code changes required to build xpconnect in unified mode; r=bholley

--HG--
extra : rebase_source : e691b361737fbb233a0b33ed7fc6aa97ae172223