Merge "Fix misc-macro-parentheses warnings." am: 2d0b1fa2e9 am: 10e811f13e
am: 78df3759f6

* commit '78df3759f6d10a9e8fd72bbf2282f5fcddfe0172':
  Fix misc-macro-parentheses warnings.

Change-Id: Idcfc85e62d0943f67573959f72196f81d33e7761