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

Change-Id: I46dca75a7cf381e6a0a582c2c92e977fbb060c33