Merge "Refresh EGL header to work with the NDK" into gingerbread