Backed out changeset ba244ef9dead (bug 1064669) for android bustage on a CLOSED TREE