am f51d65ad: Merge "Add missing <string.h> includes." automerge: 82a1a2c automerge: 86b48b3

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