Fix manual changes to ui/gl generated code; add tricium NOLINTs

Bug: 682815
Change-Id: I8b1ece30465b3e9737ccd9e090661b58874a8dea
Reviewed-on: https://chromium-review.googlesource.com/c/1459330
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Kai Ninomiya <kainino@chromium.org>
Auto-Submit: Kai Ninomiya <kainino@chromium.org>
Cr-Commit-Position: refs/heads/master@{#630203}
12 files changed