Revert "gcc-wrapper: force python version 2"

This reverts commit de84503c386557710d64f627cf2d77970a1f6740.
Merge branch 'cm-11.0' into martincz