Add workaround to support tox 1.7.2

Change-Id: I58542f6e7dbbad98517c09b6176b9827f66dd1ff
Partial-Bug: 1348818
Merge "Add workaround to support tox 1.7.2"