Backed out changeset 90f4975ba986 (bug 879172) for Android bustage on a CLOSED TREE.