tree d8c4ada6d7fca7fa8b9688bb77d9e5300548bdb7
parent 9cf79d736f2a43e3959f19d09f340526f75cb074
author Elliott Hughes <enh@google.com> 1702057627 -0800
committer Elliott Hughes <enh@google.com> 1702057627 -0800

Remove obsolete workaround.

These were added because the tests wouldn't build without them, but they
do now.

Bug: http://b/132640749
Test: treehugger
Change-Id: Idc0aff08ce461bde5ed2cd816f04dcdef5d7af5d