Backed out changeset f5c17b4a4199 (bug 960811) for android bustage on a CLOSED TREE