Cleanup for deprecated HWC versions

Change-Id: Ieec0cbca1121d3c197face3966fd63a78f178400