am 87cbeada: am 2ad48e99: am 54502698: Merge "opengles emulator: fix the mixing between pack/unpack alignments"

* commit '87cbeada5c446e39219ddde88ab2f1baf86702be':
  opengles emulator: fix the mixing between pack/unpack alignments