Merge "libGLES_android: Add generic 32bpp BGRA EGLConfig" am: 0233bd47ed
am: 190197d914

Change-Id: I2136f3da54052e56344d6c491bbe94e9303d01b9