am e5df9a06: am 7c6278de: Merge "Use new HWC display type/count constants." into klp-dev

* commit 'e5df9a069c4570ebe14009701bc43bdc80a358d2':
  Use new HWC display type/count constants.