Make style consistent with build-support/python/checkstyle-check

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