Merge "Remove infeasible gles2 matrix tests." into mnc-dev