Merge "Greatly simplify sample code by using EGL_NATIVE_VISUAL_ID." into gingerbread