Merge "Update makefiles for vehicle Hal."