Merge "Fix gl3stub.h"