Merge "libsysutils: Fix wait loop in ServiceManager::start and ::stop" into honeycomb