Revert "switch to new google sub-repositories" since this still does
break Travis

This reverts commit 8fded22736700d7ce21648679c54ebfc5e4c7b60.