Merge "Fix misc-macro-parentheses warnings in system/core."