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

Merge commit '3691181b21454bcd56c9521e8b61d96ed6e01f84'

* commit '3691181b21454bcd56c9521e8b61d96ed6e01f84':
  revert pixelformat hack