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

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

Change-Id: Ia7f58971d3c828fa0bed800585cec3ca446ca655