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

* commit '06b4e9826a33ddbdbddf7e74076ac29f9450414a':
  Add missing <malloc.h> and <string.h> includes.