Merge "Fix non-matching varying invariance in GLES2 preprocessor test."