Merge "Fix misc-macro-parentheses warnings." am: 8a6d716a1e am: f89b497da8
am: 276b60e1be

* commit '276b60e1be8ed92149411240d95705c642c7531a':
  Fix misc-macro-parentheses warnings.

Change-Id: Ibcaee3a37f4529d9ce02f0f809f1948edb134929