am 4717cace: Merge change 22222 into eclair

Merge commit '4717caceb95a2c5edc055fbf9e7a2ae53afd5278'

* commit '4717caceb95a2c5edc055fbf9e7a2ae53afd5278':
  fix a bug in ComponentSizeChooser where it could pick a software EGLConfig instead of a better h/w one.