Since we're python3 only, we don't need six anymore. Change-Id: I82c35f364315129a41dd5cbea64c0c5a50662026