Revert^3 "Upgrade error_prone annotations to 2.4.0"

02bcbbe27691b9767628337b4880c7143dd8552c

Change-Id: I5a56f5a6a56c6d41f3b7a5a34970c6a1ce99fd93
16 files changed