California lawmakers kill plans to ban oil drilling in state-controlled waters