Fixed building with a bazel with hdrs_check fixed again.

Change-Id: I015f66cd6e02e07efa367b96edd775015ac0abca
47 files changed