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

Change-Id: I994c92a70666bf1bb853139f03107ecfd76318de