Merge "servicemanager: service_manager missing include for string.h"