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

Change-Id: Id13a5691c571f473d5527570c1944d640e7914d0