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

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