Teva, AstraZeneca end dispute on Prilosec, Nexium