Merge "Fix misc-macro-parentheses warnings." am: 512c04c5cc am: 00f6841c91
am: 50bccc66cb

* commit '50bccc66cb570459ae5f93faa986204526b81262':
  Fix misc-macro-parentheses warnings.

Change-Id: I5c71a6a07436509bbc7fe58f39784c912e202585