am d4069928: Merge "Add missing <string.h> include."

* commit 'd40699287fb659eca92b93dd325f82babcef77e6':
  Add missing <string.h> include.