Additional fixes needed to fix the venv build fallback behavior were found after Ib1b8f2d3710dc3532abc818956a265f1095505b4 merged. Change-Id: Id725255ba386343a0f827ac26c24686578dee953