Merge "Use the protoc from the build, not prebuilts/"