Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev am: e575990583
am: ddd647da37

* commit 'ddd647da376f76d234e99cf93ec418ee695a14b7':
  DO NOT MERGE Rename PointerIcon and Pointer Capture APIs

Change-Id: I046fcb50e8921ba10bcfe0cf9e2c5cc06e1ddbba