am 2c16ba8c: am 03414a1c: Turn on support for async cursor update in surfaceflinger.

* commit '2c16ba8cc147e065842baaf2481e08bd3e06160d':
  Turn on support for async cursor update in surfaceflinger.

diff --cc services/surfaceflinger/DisplayHardware/HWComposer.cpp
Simple merge

diff --cc services/surfaceflinger/DisplayHardware/HWComposer.h
Simple merge

diff --cc services/surfaceflinger/SurfaceFlinger.cpp
Simple merge

diff --cc services/surfaceflinger/SurfaceFlinger.h
Simple merge