am 2f84bd10: am 458e9186: Merge change 23720 into eclair

Merge commit '2f84bd1042609ce309db174aec46da16dbbd6328'

* commit '2f84bd1042609ce309db174aec46da16dbbd6328':
  Add colorkey to gl clear operation