GitLab

This CL makes changes to the files, so they either compiled without (or
with fewer) errors with EG2. Updated EG1 build target with proper EG1
defined.

This CL does not add files to EG2 target, because tests are failing
because of EG2 helper absence.

Bug: 922813
Change-Id: I0fbb023d5861405a7324521c0f34f114ec29868e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1632591
Commit-Queue: Eugene But <eugenebut@chromium.org>
Auto-Submit: Eugene But <eugenebut@chromium.org>
Reviewed-by: Rohit Rao <rohitrao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#663853}