Merge "Remove some unneeded header includes"
am: a908348b43

Change-Id: Ide1415c25448f5624674888de956993ef2b353b7