Merge "Fix misc-macro-parentheses warnings." am: 2d0b1fa2e9 am: 10e811f13e am: 78df3759f6
am: 1efeb2c4a3

* commit '1efeb2c4a30190928e6a44ac8e48c4d785c8bc48':
  Fix misc-macro-parentheses warnings.

Change-Id: I21114a412e60d5887541265cfb1e517de6dc1702