Merge "Revert "Wrap macro definition in do-while(0)""
authorJerome Jiang <jianj@google.com>
Thu, 28 Mar 2019 18:00:57 +0000 (18:00 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 28 Mar 2019 18:00:57 +0000 (18:00 +0000)

Trivial merge