Merge "GLES: add image external enums" into ics-mr1