am 4f6e51a0: Merge "package missing include for string.h"

* commit '4f6e51a032892b1a053efa2b41ebb29e4f1bb5be':
  package missing include for string.h