Merge "Merge "Fix misc-macro-parentheses warnings." am: 945da9bbcd am: b3db6b8c3e" into nyc-dev-plus-aosp am: ae46b50c57
am: c26f645ffd

* commit 'c26f645ffd66a2f268334c6527b3e7bd5217cf7b':
  Fix misc-macro-parentheses warnings.

Change-Id: I4b95492d54c81c261b243a4bb72195fa589ae665