Bug 978111: Enable already-working PSM xpcshell tests on Android and B2G, r=cviecco

--HG--
extra : rebase_source : c14ef67870f2b40a3319e6bc8df0ddfe9dd222e3
Bug 978185: Improve error codes returned from nsIX509CertDB.addCert and nsIX50CertDB.setCertTrust, r=keeler

--HG--
extra : rebase_source : e32a913f085524d113b17d03917c10ad92c7f6e1
Automatic merge