Merge "Revert "Add r4a-friendly ktlint.jar""