Merge "HWC2: Change version detection scheme" into nyc-dev
am: 8bf556e

* commit '8bf556ec85af8d4d47aad5a19a0633cf8b0fa17e':
  HWC2: Change version detection scheme

Change-Id: Id81873cee64b8bae46d1722970179d0a183d60a6