am ae79cb5a: Merge "Add missing <string.h> includes."

* commit 'ae79cb5a819bd5bbd86a3496141d45c22db8c86b':
  Add missing <string.h> includes.