Merge "Kill <machine/exec.h>."
authorElliott Hughes <enh@google.com>
Wed, 3 Dec 2014 00:42:55 +0000 (00:42 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 3 Dec 2014 00:42:56 +0000 (00:42 +0000)

Trivial merge