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

Change-Id: Ic9eb91e09535419c81c3d69a7e41f978e6c65d16