What river became the official boundary between Texas and Mexico after the Mexican-American War?