Merge "Fix misc-macro-parentheses warnings."
am: 512c04c5cc

* commit '512c04c5cc25e5a45f707636f76e5f6565909d0c':
  Fix misc-macro-parentheses warnings.

Change-Id: If880a20b8ea5fdaca0c22d15a4ddeaf506d6c41e