Merge "Fix misc-macro-parentheses warnings." am: 8f8ed7f3f4 am: 4ca5d689be
am: b8fdcc2b65

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

Change-Id: I5eef031899ac6f2f37ce4bb042cb6f0571429f56