Backed out changeset 7eb8b5723256 (bug 943515) for mass Android test bustage.