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

* commit '72e754b022f9c0c36ae1444c7f3898e4f1e4a483':
  Fix misc-macro-parentheses warnings.

Change-Id: I99ee7c685139aa1deb041b21d52cc2f08e42256e