Merge "Fix glActiveTexture incorrect return value"