Fix one place where I missed a commented requirement for a particular

include ordering.

I've changed the structure so that clang-format will preserve this going
forward.

llvm-svn: 304788