Merge "Fix misc-macro-parentheses warnings." am: 8f8ed7f3f4 am: 4ca5d689be am: b8fdcc2b65
am: d735c26f72

* commit 'd735c26f72440b2a11652cafb95870decfb72e1a':
  Fix misc-macro-parentheses warnings.

Change-Id: Icf2813564a549b7363f09757d906ee66a850d2c4