Merge "Deprecate eglCreatePixmapSurface"