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

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

Change-Id: Ib7f4001f3f78af9036e7ceba9f7e49a094b32772