Backed out changeset 08a2398a0ddc (bug 850127) for Android NoIon bustage. a=backout