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

* commit '2ad48e99d267e1d03e27e8f49c95b753e2bcf41a':
  opengles emulator: fix the mixing between pack/unpack alignments