Fixes for errorprone update

Bug: 311064136
Test: m RUN_ERROR_PRONE=true javac-check
Change-Id: Ia6e4162a4244793f772dc880b73be0bc30f26d8b
4 files changed