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

Change-Id: I7fee184d17fbf0eb60357f4ff62f02d55da4c26a