Merge "Revert "Workaround for GCC aarch64 compiler bug""
authorTreehugger Robot <treehugger-gerrit@google.com>
Thu, 19 Jan 2017 23:18:56 +0000 (23:18 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 19 Jan 2017 23:18:56 +0000 (23:18 +0000)

Trivial merge