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

Change-Id: Ibf56c0cf4d74bc186e86acaadc5cc40841cd797c