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

* commit 'c3dcb6c06bd2fbe816a918e9c3b099669bbeb5b5':
  Consolidate the nanopb-c and regular protobuf build rules.