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

* commit '54502698db433121bd200481aa6b8bba6de85310':
  opengles emulator: fix the mixing between pack/unpack alignments