Merge change 21102

* changes:
  Fix the way the simulator reports the capabilities of the input device. This makes it no longer pretend it has as a multitouch display, trackball, etc.