Merge "Remove tzdata from core.mk, now we have explicit dependencies."