Bug 827749, fix merge problem. a=bustage.
Bug 828502 - let nsMainThreadPtrHandle::get() handle nullptrs; r=bholley, a=blocking-basecamp+
Bug 827503 - use nsMainThreadPtrHolders when passing XPCWrappedJSes around off main thread, r=bholley,jst a=blocking-basecamp+