Merge "Add missing GLES 3.x metadata"