am aa8307b9: Merge "Remove obsolete header file"

* commit 'aa8307b991b9fca5403b5d7f43659b92527af4fd':
  Remove obsolete header file