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

Change-Id: If15c1461564ebc7e734e9e40f54ecf437af74b37