Merge "Protobuf compiler support in the build system"