Allow using a newer version of protobuf#1040

nbai2022 merged 2 commits intogoogle:mastergoogle/openhtf:masterfrom

nehalkpatel:nkp/newer-protonehalkpatel/openhtf:nkp/newer-protoCopy head branch name to clipboard