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

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