Revert^2 "Upgrade error_prone annotations to 2.4.0"

a75d7c65a96c3f7de2f9ec9a72c064e84e41d750

Change-Id: I943a7b168c28d9e9c7eb915a46950f7dd0346f50
16 files changed