Add cursor type and hotspot to surface metadata. am: c15eb91b04

Change-Id: I9c707761aaee8dd576f6e4a902d2f2f2306cd71c