Use six to handle cpickle.

This was the only (AFAICT) local Python3 issue.

Change-Id: I3c2cff23d924301dc43e48e3982fb8d8938da6c0
Merge "Use six to handle cpickle."