Upgrade uses virtualenv

Related-Bug: #1341564

Change-Id: Ie93034ee209234bf811ceaa622bc599aac3bc3bb
Merge "Upgrade uses virtualenv"