Bug 939608 - Part 2: Build xpconnect in unified mode; r=bholley

--HG--
extra : rebase_source : d4baf7ddb95bb0217357b9eb9fabd2e08d37548a