Fix some incorrectly sorted entries in CODE_OWNERS