Backed out changeset e82cb49c7a8d (bug 959742) for android test bustage