Merge "Remove unused defines from Keyboard.h"