Merge "Add ktlint to preupload hooks"