Merge "libGLES_android: fix 64-bit compile errors"