Backed out changeset 4ff51fc48fa3 (bug 1026347) for causing all android tests to fail; CLOSED TREE