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

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

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