Clean up some dead code

Bug: 163976519
Test: build
Change-Id: I23bba56581223cd62a0b75d47853295050b4ce2d
1 file changed