Merge "Fix misc-macro-parentheses warnings."
am: 8558b8c809

* commit '8558b8c8097eb05b957bec3533629c13e20ba874':
  Fix misc-macro-parentheses warnings.

Change-Id: I7853b5533403bfb9faf2fbc69b274c5fe690c198