Merge "drm_hwcomposer: Add support for GetColorModes & SetCursorPosition" am: b2a9617bc8 am: c604f0a549
am: 5c2a2479c1

Change-Id: Id881dc357afb32dbe4f66a855d72568e4f0d0aac