Update tox.ini for new tox 1.6 config

Change-Id: I4363508f562f62b16c856bc072cdb4b37e37b418
Merge "Update tox.ini for new tox 1.6 config"