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

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