Merge \"DO NOT MERGE: drm_hwcomposer: On error, free active composition am: b4cf01b8ea am: 7ca7746261\" into nyc-mr1-dev-plus-aosp
am: 6f718d173a  -s ours

Change-Id: I7719b53e123ed900ee4d0b090eba59a45437fd64