Merge "SkiaRE: refactor to use eglQueryString instead"