am 22155474: Merge "logd: missing include for string.h"

* commit '221554749337a9c961c192596be5eb4e42083733':
  logd: missing include for string.h