Modify proto build infra to be able to deal with 0.20.1+
Merge pull request #19 from weingart/proto-update

Modify proto build infra to be able to deal with 0.20.1+