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

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

Change-Id: I8df44a8cbc687f81639cb061fb6739a813f0c386