Backed out changeset 3a3631ee360f (bug 1021443) for Android bustage.