tree 191aed14dfe75e549b6623f4c9388855787eb47e
parent 06a7382572f7e4e28d6a3115e25eb1e84266c0fa
author Elliott Hughes <enh@google.com> 1582320354 -0800
committer Elliott Hughes <enh@google.com> 1582410613 +0000

Remove various bits of dead code and unused workarounds.

Test: treehugger
Change-Id: I68fcd5da304d04ff4da3c3f3712fb79ce6b5791e
(cherry picked from commit 61fb2936f1142cb18c33ccc7e47360989605d6ce)