(cherry picked from commit 23fdbaa37599f490435056b9865023870656571b) [dezgeg: Un-mark shotcut, tokei & uchiwa that do build on master]