Fix checkstyle and add checkstyle back to jenkins.

Testing Done:
build.sh

Reviewed at https://reviews.apache.org/r/26098/