am 65651b2d: Merge "Set the unpack alignment before uploading a texture." into gingerbread

Merge commit '65651b2d3b9baa9ba3cb22221afe581fbd2fd767' into gingerbread-plus-aosp

* commit '65651b2d3b9baa9ba3cb22221afe581fbd2fd767':
  Set the unpack alignment before uploading a texture.