am cc230bb4: am cb64c2be: hwc: remove name collision for DISPLAY_SETUP_DISPLAY

* commit 'cc230bb412aa0bba51d0ca32cc82d1555538e392':
  hwc: remove name collision for DISPLAY_SETUP_DISPLAY