A few more changes to make the local TestService build again.

Change-Id: I6199eca2ea7d7e320f8d10dd6b314ef8c91bfd9c
4 files changed