Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev am: e575990583 am: a2f5caf77e
am: 8225b077bc  -s ours

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

Change-Id: If09ac1624b03b5c8583fc68df44c71d8acc85c75