Merge "Update EGL and GLES headers." into pi-dev am: d00e7e8de7
am: a431ba1d1b

Change-Id: I16341b0d291aef640789632378e652b396aa3d69