Diagnostics: Put the includes in the .gdr file in order

Bug: 1125150
Test: None
Change-Id: I5d02011af429c60c716f889921b36e0e78bbbe11
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2402283


Auto-Submit: Zentaro Kavanagh <zentaro@chromium.org>
Reviewed-by: Jimmy Gong <jimmyxgong@chromium.org>
Commit-Queue: Zentaro Kavanagh <zentaro@chromium.org>
Cr-Commit-Position: refs/heads/master@{#805631}