Merge "Allow 16-bit color EGLConfigs" into jb-mr1-dev