am 4909b554: am a8f2c2b4: am 902051df: Merge change I0e27b5ca into eclair

Merge commit '4909b554782c1970bce11fb421b0a06664a25718'

* commit '4909b554782c1970bce11fb421b0a06664a25718':
  Fix texture upload bug for narrow texture of less than 32bpp.