resolve merge conflicts of f8187f4e1 to oc-dr1-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Merged-In: I5f908f88923378e4d121dfd5fbc11e4f210cbb2a
Change-Id: I29912e8c2d61f7711b201deaf0e35cebb0bbf28a

diff --cc opengl/include/EGL/eglext.h
index 7de8c62,466768a..c4073a9
--- 1/opengl/include/EGL/eglext.h
--- 2/opengl/include/EGL/eglext.h
+++ b/opengl/include/EGL/eglext.h
@@@ -598,38 -528,12 +528,17 @@@ EGLAPI EGLint EGLAPIENTRY eglDupNativeF
  #ifndef EGL_ANDROID_presentation_time
  #define EGL_ANDROID_presentation_time 1
  typedef khronos_stime_nanoseconds_t EGLnsecsANDROID;
+ typedef EGLBoolean (EGLAPIENTRYP PFNEGLPRESENTATIONTIMEANDROIDPROC) (EGLDisplay dpy, EGLSurface surface, EGLnsecsANDROID time);
  #ifdef EGL_EGLEXT_PROTOTYPES
- EGLAPI EGLBoolean eglPresentationTimeANDROID(EGLDisplay dpy, EGLSurface sur, EGLnsecsANDROID time);
- #else
- typedef EGLBoolean (EGLAPIENTRYP PFNEGLPRESENTATIONTIMEANDROID) (EGLDisplay dpy, EGLSurface sur, EGLnsecsANDROID time);
- #endif
- #endif
- 
- #ifndef EGL_ANDROID_get_native_client_buffer
- #define EGL_ANDROID_get_native_client_buffer 1
- struct AHardwareBuffer;
- #ifdef EGL_EGLEXT_PROTOTYPES
- EGLAPI EGLClientBuffer eglGetNativeClientBufferANDROID (const struct AHardwareBuffer *buffer);
- #else
- typedef EGLClientBuffer (EGLAPIENTRYP PFNEGLGETNATIVECLIENTBUFFERANDROID) (const struct AHardwareBuffer *buffer);
- #endif
- #endif
- 
- #ifndef EGL_ANDROID_front_buffer_auto_refresh
- #define EGL_ANDROID_front_buffer_auto_refresh 1
- #define EGL_FRONT_BUFFER_AUTO_REFRESH_ANDROID 0x314C
- #endif
- 
- #ifndef EGL_KHR_mutable_render_buffer
- #define EGL_KHR_mutable_render_buffer 1
- #define EGL_MUTABLE_RENDER_BUFFER_BIT_KHR 0x1000
+ EGLAPI EGLBoolean EGLAPIENTRY eglPresentationTimeANDROID (EGLDisplay dpy, EGLSurface surface, EGLnsecsANDROID time);
  #endif
+ #endif /* EGL_ANDROID_presentation_time */
  
 +#ifndef EGL_KHR_no_config_context
 +#define EGL_KHR_no_config_context 1
 +#define EGL_NO_CONFIG_KHR                 EGL_CAST(EGLConfig,0)
 +#endif /* EGL_KHR_no_config_context */
 +
  #ifndef EGL_ANDROID_get_frame_timestamps
  #define EGL_ANDROID_get_frame_timestamps 1
  #define EGL_TIMESTAMPS_ANDROID 0x3430