As part of the move to javatools 2.0, drop py2 and six
As part of the move to javatools 2.0, drop py2 and six