am c07ab4bd: am 5a2fb6ce: Merge "Greatly simplify sample code by using EGL_NATIVE_VISUAL_ID." into gingerbread