Remove dead code

Bug: 8672542
Change-Id: Ia6046b17f8ae77ffe6b8090b5fbd1dda2bc0327e
2 files changed