Merge "Fix glVertexAttrib issue in dEQP test"