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

Change-Id: I3afa118c0e6d9ffbfc2c5f2e77d09b027882da4d