Merge "Remove reference to libcore/tzdata/"