Merge "Clean up arm setjmp family."
authorElliott Hughes <enh@google.com>
Fri, 5 Dec 2014 23:53:46 +0000 (23:53 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 5 Dec 2014 23:53:47 +0000 (23:53 +0000)

Trivial merge