Merge "Fix misc-macro-parentheses warnings."
am: 487ec3149c

* commit '487ec3149cd9e1f68860f3e3f05c2dee534cb0a7':
  Fix misc-macro-parentheses warnings.

Change-Id: I5da7a4a7df77116a119c01a7c2f73e2700a97a31