Merge "namespace ARCH_* defines"
authorJames Zern <jzern@google.com>
Mon, 30 Sep 2019 21:53:34 +0000 (21:53 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 30 Sep 2019 21:53:34 +0000 (21:53 +0000)

Trivial merge