Merge "libGLES_android: Add generic 32bpp BGRA EGLConfig" am: 0233bd47ed am: 190197d914 am: 354b20fe58
am: 295f4fdd48

Change-Id: I233d73f073b70f660c533c00e00c3f7bb399e294