Backed out changeset 879d1d4ff328 (bug 1026919) for Android bustage.