Merge "Upgrade to tzdata2011d."