Update our code style settings to not separate final fields

After discussion we'll allow final and non-final fields to mix when they're
related. Static fields will still separate final and non-final for now.