Merge "Fix misc-macro-parentheses warnings."
am: 3c7787fb2e

* commit '3c7787fb2e197934a0e87329644384445b1d062f':
  Fix misc-macro-parentheses warnings.

Change-Id: Icbf3971452f5431df2c3c46380ed3699ce8b178b