am f29b86b2: (-s ours) am 76942a49: Merge "egl: Reintroduce eglGetRenderBufferANDROID"

* commit 'f29b86b26aad5f50c2cae829bcce55fbb9fd8f8b':
  egl: Reintroduce eglGetRenderBufferANDROID