Revert^4 "Upgrade error_prone annotations to 2.4.0"

Fix cherry picked in ag/13351283

23331c8ff159be7fb0c208860f5df5839f28795c

Change-Id: I44fce81eddfeb254706d08b949735f8b7a6e75f1
16 files changed