Merge "SurfaceFlinger now uses GLES 2.x when available" into klp-dev