Merge "Update to latest tzdata / switch back to zones.tab" am: 44aeecc869
am: 8c329a5895

Change-Id: Ibede804904bc280f2c75e49992d0d9c5ec99c390