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

* commit '3c8c6408c50e47443483bcd928453a697f5ab97c':
  Fix misc-macro-parentheses warnings.

Change-Id: Ic5b1a8a9aa43dca4ab481340cbb80354c66529de