Merge "Change tzdatacheck to account for bundle format changes" am: 6540dfefca am: 74777579fc am: 2553a20da9
am: dc78381399

Change-Id: I1e718a53437824c9a5b07dd2a6b58e587321d770