Merge "Fix misc-macro-parentheses warnings."
am: 2d0b1fa2e9

* commit '2d0b1fa2e96723c190f5805197731256968a4d66':
  Fix misc-macro-parentheses warnings.

Change-Id: I59bc91bd8c9cf9f47efaf4f976d874e2dcb8badf