Take version into consideration in GetServiceName

Test: make vts.
Change-Id: I9c746e800cef3c6cbbe9bad3f66e7f7a9a7f8c62
1 file changed