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

Change-Id: I16b0264db050a98e161882f47bef227d5a343907