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