Merge "Add missing <string.h> includes."
automerge: 82a1a2c

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