Merge "Fix misc-macro-parentheses warnings."
am: 8f8ed7f3f4

* commit '8f8ed7f3f4b62b57f12e0055fb740cc78e407ed9':
  Fix misc-macro-parentheses warnings.

Change-Id: I16a1cd31d9558f5f35c3ccf34b49cd4af43f69b9