Fix code for more restrictive compiler [options]
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=116809572

(cherry picked from commit 04be547623ae035113c42565423b28bac425f889)

Test: Build using Error Prone which fails without this patch
Change-Id: I4e5925d9b8b8652d9eb3d155b9113be5dca4e35f
3 files changed