am 2e14f617: am 06b4e982: Merge "Add missing <malloc.h> and <string.h> includes."

* commit '2e14f61731adbb1f0d0d54bab82bc2f0ecee6a11':
  Add missing <malloc.h> and <string.h> includes.