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

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

Change-Id: I452f36981fee2eca395763adca572d9b1199f950