Fix temporary pypy gate issue with setuptools

Adding a fix proposed in bug 1290562 to avoid continuous gate failures
because of setuptools issue reported in the bug linked above.

Temporary Fixes-bug: #1290562

Change-Id: Ia8616d1939e664fc82de030b6384acb235e5c101
Merge "Fix temporary pypy gate issue with setuptools"