Merge "Fix errorprone warnings that should be errors" am: 4c6cbd9646 am: cb0e023d05 am: aa85d73d5c

Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2255483

Change-Id: Ie58957e6ad6dade523ac7335e89e6d0f75d03c80
Signed-off-by: Automerger Merge Worker <[email protected]>