Revert "gcc-wrapper: force python version 2"

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