Bug 944905 - Fix char16_t/wchar_t mismatch in xpcom/ r=bsmedberg

--HG--
extra : rebase_source : 2f81dd18df59e0498a577c437954c5b1f52f8e28
Bug 859751 - Don't use DOS encoding for popup-aero.css.

--HG--
extra : rebase_source : 9d16b435796ce95c7ae31c08279293e378ad56c2