Merge "GLES_trace: fix compile errors on 64 bit architectures"