DO NOT MERGE: Remove two almost-unused include files.

This fixes a compiler warning.

Change-Id: I7f4a866fd5a65a64861fe22e9d32a1a8b8e9758d
6 files changed