update folly to 311c98e; upstream fixes