Merge "Fix misc-macro-parentheses warnings."
am: e0a6fa0553

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

Change-Id: I6dab8681a719ce43c68dab3534c13ce41c7bc711