am 382ab18c: am 5bcbcb50: am 4f6e51a0: Merge "package missing include for string.h"

* commit '382ab18c3081108365f38a9af3925d57cdd7f2e7':
  package missing include for string.h