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