This commits enables the new optimized GPU pipeline only with the GLES
support patch upstream.

These are scheduled for the next 2.1.x release along with 2.2, so I'll
target those versions.

BUG: 435474