Merge changes Iedf67063,Ia5f9bcac,I0d319c65

* changes:
  TouchButtonAccumulator: Recognize mapped stylus buttons
  Extract HID usage accumulation logic from KeyboardInputMapper
  TouchButtonAccumulator: Miscelaneous cleanup