Merge changes Iebd90276,I645481db,I2c00fca0,I289e4470

* changes:
  TouchInputMapper: s/mExternalStylusId/mFusedStylusPointerId
  Ensure stylus buttons generate events consistently
  Add integration tests to verify the behavior of a fused external stylus
  Add unit tests for external stylus fusion