Merge "Switch tzdatacheck to comparing tzdata module file"