Fix warnings to upgrade to clang-r468909. Bug: 241011085 Test: presubmit Change-Id: Icee411244b9107f61f592a740f971896512e0a59