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

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