DO NOT MERGE: drm_hwcomposer: On error, free active composition am: b4cf01b8ea
am: 95ff952c0f

Change-Id: I1e81cd2f16a77721e4086286c316a3d1f0a6d3a5