DO NOT MERGE: drm_hwcomposer: On error, free active composition am: b4cf01b8ea am: 95ff952c0f
am: c81cbb069a  -s ours

Change-Id: I3dfb91576ead7e2be97d2af0718979dea26eb605