[automerger skipped] Merge "Add ktlint to preupload hooks" am: ff17b082 -s ours am: c1284335 -s ours am: 0f027376 -s ours am: 6d344d12 -s ours
am: 53a913ed -s ours
am skip reason: change_id Ie8659765b674ac7b2d82ed3d343f387195c07d83 with SHA1 ae7ced2f is in history

Change-Id: Ibacacb21113042c81b36f9e69f3b633b32271e59