In 1941, the General Anaya borough was merged to the Central Department, which was then renamed "Mexico City" (thus reviving the name, but not the autonomous municipality). Which boroughs was the Mexico City borough split into?