am af29b77a: Merge "libGLES_android: fix 64-bit compile errors"

* commit 'af29b77ab7dab5a1b5af27e7f7eeeb14584c101c':
  libGLES_android: fix 64-bit compile errors