Merge "logd: missing include for string.h"