Merge change 9649

* changes:
  Finish implementation of multiple pointer support for MotionEvent.