House, Senate leaders reach deal on Calif. drought, Flint

Vote could be held this week despite sharp opposition.