Cisco, Google make nice on videoconferencing