Backed out changeset c1c53022dae4 (bug 1024238) for android bustage on a CLOSED TREE