Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev am: a1e0cebf3a am: 1831ca8f04
am: 5d2ea237d4  -s ours

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

Change-Id: I1f372c46e38f32cc6f7729c45fc385dead9b4434