Backed out changeset 297008b7e1f6 (bug 1059792) for mass Android bustage.