Merge "Move brace matching rules to Preprocessor class"