am b6c21004: Merge "Implement per-display EGLConfig and configless EGLContext"

* commit 'b6c2100458bd4dda880ec24dc7d1f39825d5243d':
  Implement per-display EGLConfig and configless EGLContext