Merge "Remove an awkward #include that is no longer upstream."