Merge "Fix eglQueryString"