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

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

Change-Id: I2f5d1823c50613b6e02cfb419d59d39d96be4586