Run llvm/utils/sort_includes.py in a few files.

This will reduce the noise in a followup patch.