Merge changes I3dae9b50,I3d687a10

* changes:
  Input: Add isStylusToolType() utility function
  Differentiate fused and unfused external styluses