Split vehicle client and server interface header am: 2f2b3bbef6 am: af57a4d60c

Change-Id: I39f907dfb1fea911b378ca4e94e265fc020aedb9