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