Backed out changeset 763bcda2802f (bug 834243) for Android bustage on a CLOSED TREE