am c8d5e230: am f1c2ba49: Merge "Remove unused header file."

* commit 'c8d5e2307badc6bfcb76c4dec43a07d6b9d885cb':
  Remove unused header file.