Small fixes to build Envoy#473

jwendell wants to merge 2 commits intoproxy-wasm:mainproxy-wasm/proxy-wasm-cpp-host:mainfrom

jwendell:fixes-envoy1jwendell/proxy-wasm-cpp-host:fixes-envoy1Copy head branch name to clipboard