Make service_vm_lib automatically use correct functions

Change-Id: Ic91e409d83ecfa0f4f0f765e09c3f588ad0b0468