venv with concurrent builds patch

Change-Id: Iad8753870e9921f4b47e9a2551b3cdd06b156bfb