Merge "Fix misc-macro-parentheses warnings in frameworks/ml."