Import x11-drivers/xf86-input-keyboard version 1.6.1