Merge "libGLES_android: Add generic 32bpp BGRA EGLConfig"