Merge "Fix missing symbol for debug malloc."
authorChristopher Ferris <cferris@google.com>
Wed, 10 Dec 2014 20:33:52 +0000 (20:33 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 10 Dec 2014 20:33:52 +0000 (20:33 +0000)

Trivial merge