Fix misc-macro-parentheses warnings. am: 418442d5b6
am: 8264875e93

* commit '8264875e93eddd54b9287c2e2847b0cdf1e6f016':
  Fix misc-macro-parentheses warnings.

Change-Id: Id4ec628eb24aeda0d5474773d25fbd09edd8f76c