Merge "Fix errorprone warnings that should be errors" am: fccd9db8cf am: cecd2c6522 am: 2e5aa8a9aa

Original change: https://android-review.googlesource.com/c/platform/external/jsilver/+/2254823

Change-Id: I6662b8201e2ff78216cd8e5095afc244a2e8d3de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>