Ensure we have a PEP 440 compatible version of pytz

Change-Id: I5af13d3ff66ad298ee82831f957c72cbe2fddf99
Merge "Ensure we have a PEP 440 compatible version of pytz"