Remove unused includes

Change-Id: Ia9e0ca63064b75099f66b8088a9cc4b0af436359
2 files changed