Portions of what modern-day borough were included in the County of New York?