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

Change-Id: I1300ba5bbcca2d6add11ba980dcf211e8d79b4a1