build: update vendored six from 1.11.0 to 1.16.0 (dpkp#2398)

In this commit, the del X is still commented out due to the fact that upstream benjaminp/six#176 is not merged.

Author: shifqu