Bug 980567 - Fix wrong icon URL resolving. r=mhenretty

--HG--
extra : rebase_source : 731442a807b47e3da35f232eb155e5468200c72c
Bug 1071359 - Make WebRTC on B2G uses logcat as logging sub-system. r=jesup

--HG--
extra : rebase_source : b55353ed698e1016ded9d79bd617c7adcbf06fb3