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

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

Change-Id: I90ecaf4f83a37a7b1568d798e914e9f9507bb6e7