Fix warnings to upgrade to clang-r468909.

Bug: 241011085
Test: presubmit
Change-Id: I2eb2a31cc0bdc6ddffa303bf8d65e63b7704cbaf
3 files changed