Merge "Track 64-bit support in ZoneInfoTestHelper"