Fixes so that glkit compiles against es2_reint branch.