Merge "Switch tzdatacheck to comparing tzdata module file" am: e59703319f am: 91f35c08cd
am: 8daada6499

Change-Id: I61127be610bbb3b9a527168b8117e2bb33414462