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

Change-Id: Ice17f20d46b5e7a66bf6c0477b47fe4f05d70e56