libcontextprovider, unit tests: Refining the "service.h missing from dist" fix.
libcontextprovider, unit tests: Refining the "service.h missing from dist" fix.

rburchell/ck,rburchell/ck,rburchell/ck,rburchell/ck,rburchell/ck