hwc: Cleanup after merge

Change-Id: Iac1b46d0700f39fd9ee50f9f4f28914a433f1102