am 0f9bf17a: am 23b204e1: Merge "servicemanager: service_manager missing include for string.h"

* commit '0f9bf17ad6caf7cec9043b1330cd3387b8881c0f':
  servicemanager: service_manager missing include for string.h