am 76022c6f: Merge "revert pixelformat hack" into gingerbread

Merge commit '76022c6f4417ac91069c010aa15044e07f7b7d2e' into gingerbread-plus-aosp

* commit '76022c6f4417ac91069c010aa15044e07f7b7d2e':
  revert pixelformat hack