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

* commit '5bcbcb50bab88a01e49bddc6aab62039490298b1':
  package missing include for string.h