Amazon, Google end spat; agree to allow each other's streaming apps