Edit to workspace's "Google" folder

Fix up some build errors