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

Change-Id: Ic6062d4cc9eb535cf1be676ab8b000a77e233dfd