am 94ce1356: am 7c92b6ca: Merge "Remove an awkward #include that is no longer upstream."

* commit '94ce135693a73ac09116dabc0f2440604bba5c87':
  Remove an awkward #include that is no longer upstream.