Merge changes from topic "optimize-instructions-count-b295892886" into udc-qpr-dev

* changes:
  libhwc2.1: avoid finding std::map element twice
  libhwc2.1: change small std::map to std::array