Add in extra debug information for virtualenvs

Change-Id: I43d391b816efafa0c5453f90b12ef11d13a5ea8c