Fix misc-macro-parentheses warnings.
am: 418442d5b6

* commit '418442d5b67a27c7aecf07a726948ea0b51d9bc1':
  Fix misc-macro-parentheses warnings.

Change-Id: I7d03ca51e756a6f7416809cda92f208a23644309