Fixed cherry pick leftovers in keyboard makefile