am 458e9186: Merge change 23720 into eclair

Merge commit '458e9186c175f87c420b7f82e91c0afa695c8ebb' into eclair-plus-aosp

* commit '458e9186c175f87c420b7f82e91c0afa695c8ebb':
  Add colorkey to gl clear operation