am f526c169: (-s ours) am c3dcb6c0: Merge "Consolidate the nanopb-c and...
am f526c169: (-s ours) am c3dcb6c0: Merge "Consolidate the nanopb-c and regular protobuf build rules."
* commit 'f526c169':
Consolidate the nanopb-c and regular protobuf build rules.