Merge "Update to latest tzdata / switch back to zones.tab" into oc-dev am: 0a49354820
am: 167cee4226

Change-Id: I084031b61037afa442a8e22ed1d8c52aee6c9a21