Make Checkstyle align better with the Eclipse formatting (#13541)

Change-Id: I9f48b0da3484666a73efc517651f6920301d9c04