Tech giants Google and Amazon have settled a spat that kept their apps off each other's streaming platforms.