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

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