reflect the migration in r171366. Re-sort the #include lines to reflect the new paths. llvm-svn: 171369