fix bug 1056025 and fix bug 1037855 - rename Fennec->FennecAndroid and Webapp Runtime -> WebappRuntime as appropriate