am 0b6c4157: Merge "frameworks/native/opengl: Fix build with gcc 4.8"

* commit '0b6c41571b636cc9b47005fa971db19430cedc09':
  frameworks/native/opengl: Fix build with gcc 4.8