Merge "Fix eglSurfaceAttrib return value" into nyc-dev