Merge "Fix errorprone warnings that should be errors" am: 665bcf8220

Original change: https://android-review.googlesource.com/c/platform/external/emma/+/2254821

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