am 53cebd72: (-s ours) am ad3e0072: am 39f358b7: Merge "Protobuf compiler support in the build system"

* commit '53cebd72f7bf4fcc430c42f5eb925fec4c77d209':
  Protobuf compiler support in the build system