Fix for Chromium presubmit issue, sorting include files.