Fix misc-macro-parentheses warnings. am: 418442d5b6 am: 8264875e93
am: 49a06d1efd

* commit '49a06d1efd0a9a0b076980d172e2e7af2cd09b33':
  Fix misc-macro-parentheses warnings.

Change-Id: I7d6d9f7a31ab7e6d2ba5ba87f46a980fdf091718