Merge "Upgrade to tzdata2012j."