Merge "Add compile option to parse ELF."
authorJohann <johannkoenig@google.com>
Thu, 27 Mar 2014 18:58:26 +0000 (11:58 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 27 Mar 2014 18:58:26 +0000 (11:58 -0700)

Trivial merge