Merge "Switch tzdatacheck to comparing tzdata module file"
am: e59703319f

Change-Id: I7cec6c1225b03f6a047c5d9c8fac774490f1754e