Merge pull request #2429 from ben-clayton/test-gn-presubmit

Fix GN build and presubmits