Merge "Fix misc-macro-parentheses warnings." am: 8558b8c809 am: e3c2155db8
am: 5b27453aa1

* commit '5b27453aa18332f3e6a782fe37d44f91c629c46f':
  Fix misc-macro-parentheses warnings.

Change-Id: Iae37d0bcd89b7ffd418e288f57c50753aff03344