[automerger skipped] Merge "Add ktlint to preupload hooks"
am: ff17b0826b -s ours
am skip reason: change_id Ie8659765b674ac7b2d82ed3d343f387195c07d83 with SHA1 ae7ced2f95 is in history

Change-Id: Ibcc4ca5089d1f1ac2ab5b7bf4ce4c30e84873be8