[automerger skipped] Split vehicle client and server interface header am: 2f2b3bbef6 am: af57a4d60c am: ea6cdb8e21 am: b82291f6c2 -s ours am: 7591b00faa -s ours
am skip reason: Change-Id I550034b071ca6a7ca322fb26b61d76ed4a7307ee with SHA-1 2f2b3bbef6 is in history

Change-Id: I0f93ec4e81fbae3ee548f0bd515a2d607f4a5f07