This reverts commit https://codereview.webrtc.org/2963273002/ where the git cl format breaks include order on Windows. BUG=webrtc:7634 NOTRY=True TBR=kwiberg@webrtc.org Review-Url: https://codereview.webrtc.org/2962303003 . Cr-Commit-Position: refs/heads/master@{#18857}