Merge "Fix misc-macro-parentheses warnings in test macros."
am: 23d433c576

* commit '23d433c5769553ba4becdf093ba9fd5d1d8640ea':
  Fix misc-macro-parentheses warnings in test macros.

Change-Id: I4bd7da1675d19a08d83a553e9f980aa34c8577ac