Oh, excellent, so you should be in a better position to say what has changed
We can probably merge pebble and servicecontrol files, just need to move service name definition to some external file, bcz changes there are mostly fixes (missing calls).
We could even make libpebbleclient.so lib and strip down platform part to mere initialization.