Merge "Add make test-checkstyle"