Merge "Fix misc-macro-parentheses warnings."
am: bc0ab6d133

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

Change-Id: I3b3d4d2cdcc9e26bdf8cf6cb8586f333421a2a81