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

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

Change-Id: I137b2728a00dbdfdceb44504f4f3f4707c441d93