Remove unused include and headers

Test: m droid
Change-Id: I70841c67e814e1e67d3c5710be103472156dede8
2 files changed