Cleanup for venturi_usa and prepare for buildbot.

Change-Id: Ia00cb0a895bf396dd3b5519f917298146a75ab61