Upgrade six requirement to 1.6.0

This is needed for having URL SplitResult support.

Change-Id: I8486f8d6e07d577027856a15d60027f24cbe8782
Merge "Upgrade six requirement to 1.6.0"