Backed out changeset 6f05267b4afc (bug 798033) for Android bustage.