Merge "Consolidate the nanopb-c and regular protobuf build rules."