Merge "Fix a few typos in EGL wrapper" into gingerbread