Revert "Update to Checkstyle 8.7" am: 3518c40e86 am: c4189d24a5
am: 28cc22f3f7

Change-Id: I71b51890d22b566774142ae5541d749bfbd334c5