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

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

Change-Id: I8af61a1f7d20e4851182f990f982470ac4d25032