Backed out changeset 080344c7c80b (bug 1042715) for Android bustage.