Merge changes Ief22aac9,I92d4a60f,Ia57d1c88,I8745de89

* changes:
  Add additional ways to recognize an external stylus
  Generate key events for stylus button presses
  KeyboardInputMapper: Miscelaneous code cleanup
  KeyboardInputMapper: Remove unused "stem" key mapping