Merge "Revert "Use smaller triangles in triangle_vertex.clip_three"" into marshmallow-cts-dev