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

Change-Id: Iae135f18eb9e46ff46948e851cf44c9f3675b5e9