Merge "drm_hwcomposer: Clean up error conditions" am: c22b2a294f am: d83f784d05
am: c4b131c0c4

Change-Id: Ifde4336a33f402da9d1e23efd0d3b4031f1ad69a