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

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