Merge "Remove deleted keylayout from Makefile"