Remove unused includes.

Found while debugging 35096594.

Test: pass
Change-Id: I9d637ea4fc2cdb57afebdb299e4c890a9d814333
2 files changed