Merge "Move the virtualized vehicle hal code into the trout tree"