Refactor builder_config.build.

BUG=chromium:1038975
TEST=generate.

Change-Id: Id65a05a06cf87c89c5877e35fff56d5593c00e97
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/infra/proto/+/2031961
Tested-by: LaMont Jones <lamontjones@chromium.org>
Reviewed-by: Sean Abraham <seanabraham@chromium.org>
Commit-Queue: LaMont Jones <lamontjones@chromium.org>
diff --git a/descpb.bin b/descpb.bin
index d74f80e..d24cff6 100644
--- a/descpb.bin
+++ b/descpb.bin
Binary files differ
diff --git a/go/chromiumos/builder_config.pb.go b/go/chromiumos/builder_config.pb.go
index 1239c92..f94f00b 100644
--- a/go/chromiumos/builder_config.pb.go
+++ b/go/chromiumos/builder_config.pb.go
@@ -951,26 +951,38 @@
 	UseFlags       []*UseFlag                          `protobuf:"bytes,1,rep,name=use_flags,json=useFlags,proto3" json:"use_flags,omitempty"`
 	PortageProfile *BuilderConfig_Build_PortageProfile `protobuf:"bytes,2,opt,name=portage_profile,json=portageProfile,proto3" json:"portage_profile,omitempty"`
 	// Image types to build.
+	// DEPRECATED: Use steps.build_images.image_types.
 	ImageTypes []ImageType `protobuf:"varint,3,rep,packed,name=image_types,json=imageTypes,proto3,enum=chromiumos.ImageType" json:"image_types,omitempty"`
 	// Controls the running of the install packages step.
+	// DEPRECATED: Use steps.install_packages_conf.run_spec.
 	InstallPackages BuilderConfig_RunSpec `protobuf:"varint,4,opt,name=install_packages,json=installPackages,proto3,enum=chromiumos.BuilderConfig_RunSpec" json:"install_packages,omitempty"`
 	// Compile toolchain from source (true), or use bin packages (false).  This
 	// applies to the install toolchain step only.
+	// DEPRECATED: Use steps.install_toolchain.compile_source.
 	CompileToolchain bool `protobuf:"varint,5,opt,name=compile_toolchain,json=compileToolchain,proto3" json:"compile_toolchain,omitempty"`
 	// Whether to apply gerrit changes, if any. Use case is to build without
 	// changes after failure to identify the changes as the culprit.
 	ApplyGerritChanges bool `protobuf:"varint,6,opt,name=apply_gerrit_changes,json=applyGerritChanges,proto3" json:"apply_gerrit_changes,omitempty"`
 	// Packages to build, or empty to build all packages.
+	// DEPRECATED: Use steps.install_packages_conf.packages.
 	Packages []*PackageInfo `protobuf:"bytes,7,rep,name=packages,proto3" json:"packages,omitempty"`
 	// Build packages from source (true), or use bin packages (false).  This
 	// applies to the install packages step only.
+	// DEPRECATED: Use steps.install_packages_conf.compile_source.
 	CompileSource bool `protobuf:"varint,10,opt,name=compile_source,json=compileSource,proto3" json:"compile_source,omitempty"`
 	// Compile sdk packages from source (true) or use prebuilts (false).  This
 	// applies to the update sdk step only.
-	CompileUpdateSdk     bool     `protobuf:"varint,11,opt,name=compile_update_sdk,json=compileUpdateSdk,proto3" json:"compile_update_sdk,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	// DEPRECATED: Use steps.sdk_update.compile_source.
+	CompileUpdateSdk bool                                  `protobuf:"varint,11,opt,name=compile_update_sdk,json=compileUpdateSdk,proto3" json:"compile_update_sdk,omitempty"`
+	SdkUpdate        *BuilderConfig_Build_SdkUpdate        `protobuf:"bytes,12,opt,name=sdk_update,json=sdkUpdate,proto3" json:"sdk_update,omitempty"`
+	InstallToolchain *BuilderConfig_Build_InstallToolchain `protobuf:"bytes,13,opt,name=install_toolchain,json=installToolchain,proto3" json:"install_toolchain,omitempty"`
+	// TODO(crbug/1038975): rename this to install_packages once the RunSpec is
+	// gone above.
+	InstallPackagesConf  *BuilderConfig_Build_InstallPackages `protobuf:"bytes,14,opt,name=install_packages_conf,json=installPackagesConf,proto3" json:"install_packages_conf,omitempty"`
+	BuildImages          *BuilderConfig_Build_BuildImages     `protobuf:"bytes,15,opt,name=build_images,json=buildImages,proto3" json:"build_images,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                             `json:"-"`
+	XXX_unrecognized     []byte                               `json:"-"`
+	XXX_sizecache        int32                                `json:"-"`
 }
 
 func (m *BuilderConfig_Build) Reset()         { *m = BuilderConfig_Build{} }
@@ -1061,6 +1073,34 @@
 	return false
 }
 
+func (m *BuilderConfig_Build) GetSdkUpdate() *BuilderConfig_Build_SdkUpdate {
+	if m != nil {
+		return m.SdkUpdate
+	}
+	return nil
+}
+
+func (m *BuilderConfig_Build) GetInstallToolchain() *BuilderConfig_Build_InstallToolchain {
+	if m != nil {
+		return m.InstallToolchain
+	}
+	return nil
+}
+
+func (m *BuilderConfig_Build) GetInstallPackagesConf() *BuilderConfig_Build_InstallPackages {
+	if m != nil {
+		return m.InstallPackagesConf
+	}
+	return nil
+}
+
+func (m *BuilderConfig_Build) GetBuildImages() *BuilderConfig_Build_BuildImages {
+	if m != nil {
+		return m.BuildImages
+	}
+	return nil
+}
+
 // The profile of the variant to set up and build.
 type BuilderConfig_Build_PortageProfile struct {
 	Profile              string   `protobuf:"bytes,1,opt,name=profile,proto3" json:"profile,omitempty"`
@@ -1101,6 +1141,192 @@
 	return ""
 }
 
+// Below here are configuration specifications for the steps that call the
+// Build API endpoints.
+//
+// TODO(crbug/1038975): remove DEPRECATED fields above.
+//
+// Controls for the call to SdkService.Update.
+type BuilderConfig_Build_SdkUpdate struct {
+	// Whether to compile from source (vs using prebuilts when able.)
+	CompileSource        bool     `protobuf:"varint,1,opt,name=compile_source,json=compileSource,proto3" json:"compile_source,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *BuilderConfig_Build_SdkUpdate) Reset()         { *m = BuilderConfig_Build_SdkUpdate{} }
+func (m *BuilderConfig_Build_SdkUpdate) String() string { return proto.CompactTextString(m) }
+func (*BuilderConfig_Build_SdkUpdate) ProtoMessage()    {}
+func (*BuilderConfig_Build_SdkUpdate) Descriptor() ([]byte, []int) {
+	return fileDescriptor_6fe67302c16003fb, []int{0, 5, 1}
+}
+
+func (m *BuilderConfig_Build_SdkUpdate) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BuilderConfig_Build_SdkUpdate.Unmarshal(m, b)
+}
+func (m *BuilderConfig_Build_SdkUpdate) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BuilderConfig_Build_SdkUpdate.Marshal(b, m, deterministic)
+}
+func (m *BuilderConfig_Build_SdkUpdate) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuilderConfig_Build_SdkUpdate.Merge(m, src)
+}
+func (m *BuilderConfig_Build_SdkUpdate) XXX_Size() int {
+	return xxx_messageInfo_BuilderConfig_Build_SdkUpdate.Size(m)
+}
+func (m *BuilderConfig_Build_SdkUpdate) XXX_DiscardUnknown() {
+	xxx_messageInfo_BuilderConfig_Build_SdkUpdate.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BuilderConfig_Build_SdkUpdate proto.InternalMessageInfo
+
+func (m *BuilderConfig_Build_SdkUpdate) GetCompileSource() bool {
+	if m != nil {
+		return m.CompileSource
+	}
+	return false
+}
+
+// Controls for the call to SysrootService.InstallToolchain.
+type BuilderConfig_Build_InstallToolchain struct {
+	// Whether to compile from source (vs using prebuilts when able.)
+	CompileSource        bool     `protobuf:"varint,1,opt,name=compile_source,json=compileSource,proto3" json:"compile_source,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *BuilderConfig_Build_InstallToolchain) Reset()         { *m = BuilderConfig_Build_InstallToolchain{} }
+func (m *BuilderConfig_Build_InstallToolchain) String() string { return proto.CompactTextString(m) }
+func (*BuilderConfig_Build_InstallToolchain) ProtoMessage()    {}
+func (*BuilderConfig_Build_InstallToolchain) Descriptor() ([]byte, []int) {
+	return fileDescriptor_6fe67302c16003fb, []int{0, 5, 2}
+}
+
+func (m *BuilderConfig_Build_InstallToolchain) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BuilderConfig_Build_InstallToolchain.Unmarshal(m, b)
+}
+func (m *BuilderConfig_Build_InstallToolchain) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BuilderConfig_Build_InstallToolchain.Marshal(b, m, deterministic)
+}
+func (m *BuilderConfig_Build_InstallToolchain) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuilderConfig_Build_InstallToolchain.Merge(m, src)
+}
+func (m *BuilderConfig_Build_InstallToolchain) XXX_Size() int {
+	return xxx_messageInfo_BuilderConfig_Build_InstallToolchain.Size(m)
+}
+func (m *BuilderConfig_Build_InstallToolchain) XXX_DiscardUnknown() {
+	xxx_messageInfo_BuilderConfig_Build_InstallToolchain.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BuilderConfig_Build_InstallToolchain proto.InternalMessageInfo
+
+func (m *BuilderConfig_Build_InstallToolchain) GetCompileSource() bool {
+	if m != nil {
+		return m.CompileSource
+	}
+	return false
+}
+
+// Controls for the call to InstallPackages.
+type BuilderConfig_Build_InstallPackages struct {
+	// Whether to compile from source (vs using prebuilts when able.)
+	CompileSource bool `protobuf:"varint,1,opt,name=compile_source,json=compileSource,proto3" json:"compile_source,omitempty"`
+	// Controls the running of the install packages step.
+	RunSpec BuilderConfig_RunSpec `protobuf:"varint,2,opt,name=run_spec,json=runSpec,proto3,enum=chromiumos.BuilderConfig_RunSpec" json:"run_spec,omitempty"`
+	// Packages to build, or empty to build all packages.
+	Packages             []*PackageInfo `protobuf:"bytes,3,rep,name=packages,proto3" json:"packages,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *BuilderConfig_Build_InstallPackages) Reset()         { *m = BuilderConfig_Build_InstallPackages{} }
+func (m *BuilderConfig_Build_InstallPackages) String() string { return proto.CompactTextString(m) }
+func (*BuilderConfig_Build_InstallPackages) ProtoMessage()    {}
+func (*BuilderConfig_Build_InstallPackages) Descriptor() ([]byte, []int) {
+	return fileDescriptor_6fe67302c16003fb, []int{0, 5, 3}
+}
+
+func (m *BuilderConfig_Build_InstallPackages) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BuilderConfig_Build_InstallPackages.Unmarshal(m, b)
+}
+func (m *BuilderConfig_Build_InstallPackages) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BuilderConfig_Build_InstallPackages.Marshal(b, m, deterministic)
+}
+func (m *BuilderConfig_Build_InstallPackages) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuilderConfig_Build_InstallPackages.Merge(m, src)
+}
+func (m *BuilderConfig_Build_InstallPackages) XXX_Size() int {
+	return xxx_messageInfo_BuilderConfig_Build_InstallPackages.Size(m)
+}
+func (m *BuilderConfig_Build_InstallPackages) XXX_DiscardUnknown() {
+	xxx_messageInfo_BuilderConfig_Build_InstallPackages.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BuilderConfig_Build_InstallPackages proto.InternalMessageInfo
+
+func (m *BuilderConfig_Build_InstallPackages) GetCompileSource() bool {
+	if m != nil {
+		return m.CompileSource
+	}
+	return false
+}
+
+func (m *BuilderConfig_Build_InstallPackages) GetRunSpec() BuilderConfig_RunSpec {
+	if m != nil {
+		return m.RunSpec
+	}
+	return BuilderConfig_RUN_SPEC_UNSPECIFIED
+}
+
+func (m *BuilderConfig_Build_InstallPackages) GetPackages() []*PackageInfo {
+	if m != nil {
+		return m.Packages
+	}
+	return nil
+}
+
+type BuilderConfig_Build_BuildImages struct {
+	// Image types to build.
+	ImageTypes           []ImageType `protobuf:"varint,1,rep,packed,name=image_types,json=imageTypes,proto3,enum=chromiumos.ImageType" json:"image_types,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *BuilderConfig_Build_BuildImages) Reset()         { *m = BuilderConfig_Build_BuildImages{} }
+func (m *BuilderConfig_Build_BuildImages) String() string { return proto.CompactTextString(m) }
+func (*BuilderConfig_Build_BuildImages) ProtoMessage()    {}
+func (*BuilderConfig_Build_BuildImages) Descriptor() ([]byte, []int) {
+	return fileDescriptor_6fe67302c16003fb, []int{0, 5, 4}
+}
+
+func (m *BuilderConfig_Build_BuildImages) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BuilderConfig_Build_BuildImages.Unmarshal(m, b)
+}
+func (m *BuilderConfig_Build_BuildImages) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BuilderConfig_Build_BuildImages.Marshal(b, m, deterministic)
+}
+func (m *BuilderConfig_Build_BuildImages) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuilderConfig_Build_BuildImages.Merge(m, src)
+}
+func (m *BuilderConfig_Build_BuildImages) XXX_Size() int {
+	return xxx_messageInfo_BuilderConfig_Build_BuildImages.Size(m)
+}
+func (m *BuilderConfig_Build_BuildImages) XXX_DiscardUnknown() {
+	xxx_messageInfo_BuilderConfig_Build_BuildImages.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BuilderConfig_Build_BuildImages proto.InternalMessageInfo
+
+func (m *BuilderConfig_Build_BuildImages) GetImageTypes() []ImageType {
+	if m != nil {
+		return m.ImageTypes
+	}
+	return nil
+}
+
 type BuilderConfig_UnitTests struct {
 	// Skipped packages.
 	PackageBlacklist []*PackageInfo `protobuf:"bytes,4,rep,name=package_blacklist,json=packageBlacklist,proto3" json:"package_blacklist,omitempty"`
@@ -1218,6 +1444,10 @@
 	proto.RegisterType((*BuilderConfig_Chrome)(nil), "chromiumos.BuilderConfig.Chrome")
 	proto.RegisterType((*BuilderConfig_Build)(nil), "chromiumos.BuilderConfig.Build")
 	proto.RegisterType((*BuilderConfig_Build_PortageProfile)(nil), "chromiumos.BuilderConfig.Build.PortageProfile")
+	proto.RegisterType((*BuilderConfig_Build_SdkUpdate)(nil), "chromiumos.BuilderConfig.Build.SdkUpdate")
+	proto.RegisterType((*BuilderConfig_Build_InstallToolchain)(nil), "chromiumos.BuilderConfig.Build.InstallToolchain")
+	proto.RegisterType((*BuilderConfig_Build_InstallPackages)(nil), "chromiumos.BuilderConfig.Build.InstallPackages")
+	proto.RegisterType((*BuilderConfig_Build_BuildImages)(nil), "chromiumos.BuilderConfig.Build.BuildImages")
 	proto.RegisterType((*BuilderConfig_UnitTests)(nil), "chromiumos.BuilderConfig.UnitTests")
 	proto.RegisterType((*BuilderConfigs)(nil), "chromiumos.BuilderConfigs")
 }
@@ -1225,118 +1455,128 @@
 func init() { proto.RegisterFile("chromiumos/builder_config.proto", fileDescriptor_6fe67302c16003fb) }
 
 var fileDescriptor_6fe67302c16003fb = []byte{
-	// 1797 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x57, 0x5f, 0x73, 0xdb, 0xc6,
-	0x11, 0x2f, 0xff, 0x88, 0x7f, 0x96, 0x22, 0x09, 0x9d, 0x14, 0x9b, 0x86, 0x53, 0xdb, 0x55, 0xda,
-	0x8e, 0x93, 0x26, 0x54, 0xaa, 0xd4, 0x9e, 0xce, 0x64, 0x3a, 0x29, 0x08, 0x82, 0x34, 0x6c, 0x12,
-	0x40, 0x8f, 0xa0, 0x14, 0x67, 0x3a, 0xbd, 0x01, 0xc1, 0x23, 0x89, 0x11, 0x08, 0xa0, 0x00, 0x18,
-	0x8f, 0xbe, 0x57, 0xfb, 0xd0, 0xa7, 0x4e, 0x27, 0xdf, 0xa1, 0x6f, 0x7d, 0xee, 0x47, 0xe8, 0x6b,
-	0xe7, 0x0e, 0x00, 0x09, 0xca, 0x56, 0xa4, 0x69, 0xdf, 0xb0, 0xbb, 0xbf, 0xdf, 0xde, 0xde, 0xdd,
-	0xf2, 0xb7, 0x47, 0x78, 0x6a, 0xaf, 0x42, 0x7f, 0xed, 0x6c, 0xd6, 0x7e, 0x74, 0x36, 0xdb, 0x38,
-	0xee, 0x9c, 0x86, 0xc4, 0xf6, 0xbd, 0x85, 0xb3, 0xec, 0x06, 0xa1, 0x1f, 0xfb, 0x08, 0x76, 0x00,
-	0xf1, 0x61, 0x0e, 0x6c, 0xfb, 0xeb, 0xb5, 0xef, 0x25, 0x20, 0xf1, 0xe9, 0xd2, 0xf7, 0x97, 0x2e,
-	0x3d, 0xe3, 0xd6, 0x6c, 0xb3, 0x38, 0x8b, 0x9d, 0x35, 0x8d, 0x62, 0x6b, 0x1d, 0xa4, 0x80, 0x27,
-	0x37, 0x01, 0xef, 0x42, 0x2b, 0x08, 0x68, 0x18, 0x25, 0xf1, 0xd3, 0xbf, 0x3c, 0x81, 0x66, 0x2f,
-	0x59, 0x5e, 0xe6, 0xab, 0xa3, 0xcf, 0xa1, 0xe8, 0xcc, 0x3b, 0x85, 0x67, 0x85, 0xe7, 0x8d, 0xf3,
-	0x8f, 0xbb, 0xbb, 0x85, 0xbb, 0x7b, 0xb0, 0xae, 0x3a, 0xc7, 0x45, 0x67, 0x8e, 0xbe, 0x86, 0xea,
-	0x92, 0x7a, 0x34, 0xb4, 0xdc, 0x4e, 0x91, 0x53, 0x7e, 0x76, 0x3b, 0x65, 0x98, 0x00, 0x71, 0xc6,
-	0x40, 0xaf, 0xe1, 0xd0, 0x0f, 0xed, 0x15, 0x8d, 0xe2, 0xd0, 0x8a, 0xfd, 0xb0, 0x53, 0xe2, 0x19,
-	0x7e, 0x79, 0x7b, 0x06, 0x3d, 0x87, 0xc6, 0x7b, 0x5c, 0x24, 0x41, 0xdd, 0x0a, 0x63, 0x67, 0x61,
-	0xd9, 0x71, 0xd4, 0x29, 0xf3, 0x44, 0x9f, 0xdc, 0x9e, 0x48, 0xca, 0xa0, 0x78, 0xc7, 0x42, 0xbf,
-	0x85, 0x0a, 0x27, 0xd0, 0xce, 0x01, 0xe7, 0x3f, 0xbb, 0x9d, 0x2f, 0x73, 0x1c, 0x4e, 0xf1, 0xe8,
-	0x05, 0x1c, 0xf0, 0x3b, 0xec, 0x54, 0x38, 0xf1, 0xe9, 0xed, 0x44, 0x6e, 0xe1, 0x04, 0x8d, 0x7a,
-	0x00, 0x1b, 0xcf, 0x89, 0x49, 0x4c, 0xa3, 0x38, 0xea, 0x54, 0xef, 0x2a, 0x7a, 0xea, 0x39, 0xb1,
-	0xc9, 0xa0, 0xb8, 0xbe, 0xc9, 0x3e, 0xc5, 0xbf, 0x17, 0xa0, 0xa8, 0xce, 0x11, 0x82, 0xb2, 0x67,
-	0xad, 0x29, 0xbf, 0xb7, 0x3a, 0xe6, 0xdf, 0xe8, 0x01, 0x54, 0x66, 0xa1, 0xe5, 0xd9, 0x2b, 0x7e,
-	0x35, 0x75, 0x9c, 0x5a, 0xe8, 0x05, 0x94, 0xe3, 0xeb, 0x80, 0xf2, 0xe3, 0x6e, 0xfd, 0xd8, 0x85,
-	0xa9, 0xf3, 0xae, 0x79, 0x1d, 0x50, 0xcc, 0xe1, 0xa7, 0x17, 0x50, 0x66, 0x16, 0x3a, 0x01, 0xc1,
-	0x7c, 0x6b, 0x28, 0x64, 0xaa, 0x4d, 0x0c, 0x45, 0x56, 0x07, 0xaa, 0xd2, 0x17, 0x7e, 0x82, 0x2a,
-	0x50, 0x94, 0xff, 0x20, 0x14, 0x50, 0x0b, 0xc0, 0xd0, 0x27, 0xe6, 0x64, 0xda, 0x1b, 0xab, 0xa6,
-	0x50, 0x44, 0x4d, 0xa8, 0x9b, 0xba, 0x3e, 0x92, 0x5f, 0x49, 0xaa, 0x26, 0x94, 0xd0, 0x11, 0x34,
-	0x55, 0x6d, 0xa0, 0xe3, 0xb1, 0x64, 0xaa, 0xba, 0x26, 0x8d, 0x84, 0xb2, 0xf8, 0xef, 0x32, 0x54,
-	0xd3, 0xd6, 0x40, 0x2f, 0xa1, 0x66, 0x87, 0x4e, 0xec, 0xd8, 0x96, 0x9b, 0xb6, 0xa0, 0xd8, 0x4d,
-	0x3a, 0xb8, 0x9b, 0x75, 0x70, 0xb7, 0xe7, 0xfb, 0xee, 0x85, 0xe5, 0x6e, 0x28, 0xde, 0x62, 0x91,
-	0x0e, 0x0d, 0xea, 0x7d, 0xef, 0x84, 0xbe, 0xb7, 0xa6, 0x5e, 0xcc, 0xf7, 0xdb, 0x3a, 0xff, 0xe2,
-	0xce, 0x56, 0xec, 0x2a, 0x3b, 0x12, 0xce, 0x67, 0x40, 0x7d, 0xa8, 0x85, 0x1b, 0x8f, 0xbc, 0x5b,
-	0x51, 0x2f, 0x6d, 0xcb, 0x4f, 0xef, 0xce, 0x86, 0x37, 0xde, 0xe5, 0x8a, 0x7a, 0xb8, 0x1a, 0x26,
-	0x1f, 0xe8, 0x1b, 0x68, 0xce, 0x42, 0xff, 0x8a, 0x7a, 0x64, 0x46, 0x17, 0x7e, 0x48, 0xd3, 0xc6,
-	0x7c, 0x7f, 0x4f, 0x66, 0xf6, 0xb3, 0xc5, 0x87, 0x09, 0xa1, 0xc7, 0xf1, 0xe8, 0x33, 0x38, 0x8a,
-	0xe6, 0x57, 0xc4, 0xb6, 0xec, 0x15, 0x25, 0xdf, 0xd3, 0x30, 0x72, 0x7c, 0x8f, 0x77, 0xe7, 0x01,
-	0x6e, 0x47, 0xf3, 0x2b, 0x99, 0xf9, 0x2f, 0x12, 0xb7, 0xf8, 0xcf, 0x02, 0x54, 0xd3, 0x0a, 0x50,
-	0x0f, 0xca, 0x6b, 0x7f, 0x9e, 0xb4, 0x43, 0xeb, 0xbc, 0x7b, 0xef, 0xd2, 0xbb, 0x63, 0x7f, 0x4e,
-	0x31, 0xe7, 0xa2, 0x4f, 0xa0, 0xb9, 0x70, 0x5c, 0x4a, 0x02, 0x2b, 0x8e, 0x69, 0xe8, 0x45, 0x9d,
-	0xe2, 0xb3, 0xd2, 0xf3, 0x3a, 0x3e, 0x64, 0x4e, 0x23, 0xf5, 0x9d, 0xce, 0xa0, 0xcc, 0x28, 0xac,
-	0x29, 0xc6, 0x7a, 0xff, 0x66, 0x53, 0xb4, 0x00, 0xa4, 0xd1, 0xa5, 0xf4, 0x76, 0x42, 0xf0, 0x54,
-	0x13, 0x0a, 0x48, 0x84, 0x07, 0xba, 0x36, 0x7a, 0xcb, 0x2c, 0xa2, 0x6b, 0x64, 0xa0, 0x8e, 0x14,
-	0x32, 0x96, 0x4c, 0xf9, 0x95, 0x50, 0x44, 0x1d, 0x38, 0xd1, 0xf4, 0x0f, 0x44, 0x4a, 0xa7, 0x43,
-	0x68, 0xe4, 0xee, 0x09, 0x3d, 0x86, 0x87, 0x8a, 0x76, 0xa1, 0x62, 0x5d, 0x1b, 0x2b, 0x9a, 0xf9,
-	0xfe, 0x8a, 0x06, 0xd6, 0xfb, 0x53, 0x99, 0xb5, 0x97, 0x50, 0x40, 0x0d, 0xa8, 0x4e, 0x4c, 0x69,
-	0xa8, 0x6a, 0x43, 0xa1, 0x28, 0xfe, 0xa7, 0x08, 0x87, 0x79, 0x09, 0x41, 0x22, 0xd4, 0xec, 0x95,
-	0xe3, 0xce, 0x43, 0xea, 0x75, 0x0a, 0x7c, 0x77, 0x5b, 0x1b, 0xfd, 0x1e, 0x5a, 0x4b, 0x27, 0x76,
-	0x5c, 0x1a, 0x11, 0x26, 0xb9, 0x4e, 0x9c, 0x0a, 0xdc, 0xa3, 0xfc, 0x61, 0x0e, 0x13, 0x84, 0xcc,
-	0x01, 0xb8, 0xb9, 0xcc, 0x9b, 0xe8, 0x1b, 0x68, 0x2d, 0x69, 0x18, 0x3a, 0x31, 0xb1, 0x57, 0x96,
-	0xb7, 0xa4, 0x51, 0xa7, 0xf4, 0xac, 0xf4, 0xbc, 0x71, 0xde, 0xd9, 0xcb, 0xc0, 0x11, 0x32, 0x07,
-	0xe0, 0xe6, 0x32, 0x67, 0x45, 0xe8, 0xcf, 0xf0, 0x60, 0xe1, 0xbb, 0xae, 0xff, 0x8e, 0xf8, 0x1e,
-	0xd9, 0x53, 0xca, 0xa4, 0x8f, 0xbe, 0xbe, 0x9f, 0x52, 0x76, 0x07, 0x3c, 0x89, 0xee, 0xed, 0xc9,
-	0xe7, 0xc9, 0xe2, 0x03, 0x5e, 0x71, 0x0a, 0x27, 0x1f, 0x42, 0x7f, 0x50, 0x5f, 0x3e, 0x05, 0xc1,
-	0x7a, 0x67, 0xb1, 0xed, 0xf9, 0xeb, 0xc0, 0xa5, 0x31, 0xeb, 0x4d, 0x76, 0x46, 0x35, 0xdc, 0xe6,
-	0x7e, 0x79, 0xeb, 0x16, 0xff, 0x05, 0x50, 0xdf, 0x6a, 0x2e, 0x7a, 0x03, 0xf5, 0x20, 0xa4, 0x4c,
-	0x03, 0xe3, 0x28, 0x6d, 0xd1, 0x2f, 0xee, 0xa1, 0xd5, 0x5d, 0x23, 0x23, 0xe1, 0x1d, 0x1f, 0x7d,
-	0x0b, 0xad, 0x4c, 0xc2, 0x09, 0xd3, 0xa9, 0xa4, 0x4f, 0x5b, 0xe7, 0xbf, 0xbe, 0x4f, 0xc6, 0xec,
-	0x8b, 0x09, 0x5b, 0x84, 0x9b, 0x56, 0xde, 0x44, 0x5d, 0x38, 0xde, 0x2e, 0x43, 0x96, 0x11, 0x99,
-	0x6d, 0xec, 0x2b, 0x1a, 0x73, 0x39, 0xa8, 0xe3, 0xa3, 0x6d, 0x68, 0x18, 0xf5, 0x78, 0x80, 0xe1,
-	0xb7, 0xc3, 0x24, 0x87, 0x2f, 0x27, 0xf8, 0x6d, 0x68, 0x8b, 0xff, 0x23, 0x1c, 0x05, 0x9b, 0x99,
-	0xeb, 0x44, 0x2b, 0xb2, 0x1b, 0x5d, 0x07, 0xbc, 0x45, 0xce, 0xee, 0x75, 0x1c, 0x09, 0x59, 0xf5,
-	0x16, 0x3e, 0x16, 0xd2, 0x4c, 0xbb, 0x43, 0xfe, 0x13, 0xb4, 0x1d, 0x2f, 0xd8, 0xc4, 0xb9, 0xdc,
-	0x15, 0x9e, 0xfb, 0xc5, 0x7d, 0x72, 0xab, 0x8c, 0x9a, 0x99, 0x7c, 0x85, 0x96, 0x93, 0x77, 0x45,
-	0xe2, 0x3f, 0x0a, 0xd0, 0xc8, 0x55, 0xc0, 0xa4, 0x2a, 0xdb, 0xcd, 0x6e, 0xef, 0x49, 0xbb, 0xb4,
-	0xd3, 0xc0, 0x76, 0xe7, 0x17, 0xd0, 0xcc, 0xb0, 0xff, 0xe7, 0x95, 0x1d, 0xa6, 0x79, 0x76, 0x37,
-	0xb6, 0xab, 0xc1, 0xf5, 0x6d, 0x8b, 0x37, 0x65, 0x76, 0x63, 0x59, 0x15, 0xa3, 0x34, 0x20, 0xfe,
-	0xb5, 0x00, 0x47, 0xef, 0xed, 0x14, 0x59, 0x70, 0xbc, 0x7f, 0x72, 0xbc, 0xc8, 0xb4, 0x51, 0xff,
-	0x87, 0x1a, 0x8f, 0xf6, 0x4e, 0x8e, 0xcf, 0xd0, 0xdf, 0xc1, 0xe3, 0x1b, 0x4b, 0xe4, 0xea, 0xcd,
-	0x94, 0xb6, 0xb3, 0xc7, 0xdb, 0x95, 0x1d, 0x9d, 0xaa, 0x50, 0xdf, 0xfe, 0x16, 0xd0, 0x23, 0xf8,
-	0xc8, 0xc0, 0x4a, 0x6f, 0xaa, 0x8e, 0xcc, 0xc9, 0x0d, 0x35, 0x04, 0xa8, 0x18, 0xd3, 0xde, 0x48,
-	0x95, 0x13, 0x25, 0x34, 0xb0, 0x7a, 0x21, 0x99, 0x8a, 0x50, 0x44, 0x35, 0x28, 0x6b, 0xba, 0xa6,
-	0x08, 0xa5, 0xd3, 0x1f, 0x4a, 0xd0, 0xdc, 0x2b, 0x17, 0x3d, 0x01, 0x51, 0xc2, 0xa6, 0x3a, 0x90,
-	0x64, 0x93, 0xb0, 0x41, 0x7f, 0x33, 0x69, 0x13, 0xea, 0xea, 0x58, 0x1a, 0x2a, 0xe4, 0x3b, 0xd5,
-	0x10, 0x0a, 0xe8, 0x21, 0x1c, 0x9b, 0xca, 0xc4, 0x24, 0x53, 0xa3, 0x2f, 0x99, 0x0a, 0x31, 0xa4,
-	0xb7, 0x23, 0x5d, 0xea, 0x0b, 0x45, 0x84, 0xa0, 0x25, 0x4d, 0x4d, 0x9d, 0x07, 0x99, 0x9e, 0x4f,
-	0x84, 0x12, 0x93, 0x67, 0x53, 0xda, 0xda, 0x65, 0x46, 0x36, 0x54, 0x4d, 0x53, 0xfa, 0x64, 0x38,
-	0x65, 0x38, 0x9e, 0x78, 0x22, 0x1c, 0xa0, 0x43, 0xa8, 0x0d, 0x54, 0x3c, 0xbe, 0x94, 0xb0, 0x22,
-	0x54, 0x50, 0x1b, 0x1a, 0x7c, 0x83, 0x7d, 0x32, 0xd2, 0x87, 0x13, 0xa1, 0x8a, 0x8e, 0xa1, 0x2d,
-	0xbf, 0xc2, 0xfa, 0x58, 0xd1, 0x27, 0x44, 0xd6, 0xb5, 0x81, 0x3a, 0x14, 0x6a, 0x2c, 0xb9, 0x6c,
-	0x28, 0x04, 0x2b, 0x86, 0x8e, 0x4d, 0xa1, 0xce, 0x0a, 0x48, 0x0a, 0x95, 0xb0, 0xfc, 0x4a, 0xbd,
-	0x50, 0x26, 0x02, 0xa0, 0x8f, 0xa1, 0x33, 0xd5, 0x2e, 0x14, 0xcc, 0x37, 0x43, 0x74, 0xdc, 0x57,
-	0xb0, 0xaa, 0x0d, 0x79, 0x3d, 0x42, 0x83, 0xcd, 0xa7, 0x5b, 0x62, 0x87, 0xec, 0x58, 0x92, 0x25,
-	0x89, 0x3c, 0x92, 0xb4, 0x21, 0xb9, 0x94, 0xb0, 0xa6, 0x6a, 0xc3, 0x49, 0x12, 0x6f, 0xde, 0xc8,
-	0x3c, 0x1a, 0x5d, 0x8c, 0x89, 0x31, 0xd4, 0x93, 0x68, 0x0b, 0x3d, 0x85, 0xc7, 0xb9, 0x68, 0x9a,
-	0x48, 0x1a, 0xf4, 0x53, 0x40, 0x1b, 0xfd, 0x14, 0x1e, 0xdd, 0x1e, 0x16, 0xf6, 0xc2, 0x6f, 0x14,
-	0xac, 0x29, 0xa3, 0x5c, 0xf8, 0x48, 0xfc, 0x39, 0x54, 0x92, 0x27, 0x29, 0x1b, 0x69, 0x8e, 0xc7,
-	0x66, 0x73, 0xfa, 0x82, 0xaa, 0xe1, 0xad, 0x2d, 0xfe, 0xad, 0x0c, 0x07, 0xbc, 0x65, 0xd1, 0x97,
-	0x50, 0xdf, 0x44, 0x94, 0x2c, 0x5c, 0x6b, 0x19, 0xf1, 0xc9, 0xd7, 0x38, 0x3f, 0xce, 0x37, 0xf6,
-	0x34, 0xa2, 0x03, 0xd7, 0x5a, 0xe2, 0xda, 0x26, 0xf9, 0x88, 0xd0, 0x25, 0xb4, 0x03, 0x3f, 0x8c,
-	0xad, 0x25, 0x25, 0x41, 0xe8, 0xb3, 0x37, 0x40, 0x3a, 0x0f, 0xbb, 0x77, 0x3c, 0x76, 0xbb, 0x46,
-	0x42, 0x33, 0x12, 0x16, 0x6e, 0x05, 0x7b, 0x36, 0x7a, 0x09, 0x0d, 0x67, 0xcd, 0xd2, 0x26, 0x4a,
-	0x50, 0xe2, 0x4a, 0xf0, 0x51, 0x3e, 0xa9, 0xca, 0xc2, 0xfc, 0x21, 0x0a, 0x4e, 0xf6, 0x19, 0xa1,
-	0x11, 0x08, 0x8e, 0x17, 0xc5, 0x96, 0xeb, 0x92, 0xc0, 0xb2, 0xaf, 0x2c, 0x36, 0x5f, 0xcb, 0x77,
-	0xbd, 0x68, 0xf1, 0xc6, 0x9b, 0x04, 0xd4, 0xc6, 0xed, 0x94, 0x6a, 0xa4, 0x4c, 0xf4, 0x2b, 0x38,
-	0x62, 0x53, 0x8c, 0xbd, 0x77, 0x62, 0xdf, 0x77, 0xed, 0x95, 0xe5, 0x24, 0x0f, 0xad, 0x1a, 0x16,
-	0xd2, 0x80, 0x99, 0xf9, 0xd1, 0x97, 0x70, 0x62, 0x05, 0x81, 0x7b, 0x4d, 0x6e, 0x8c, 0xf7, 0x0a,
-	0xc7, 0x23, 0x1e, 0x1b, 0xee, 0x4d, 0xf2, 0xaf, 0xa0, 0xb6, 0x2d, 0xb2, 0xca, 0x8f, 0xfb, 0x61,
-	0xbe, 0xc8, 0xb4, 0x0c, 0xae, 0xb3, 0x5b, 0x20, 0xfa, 0x05, 0xb4, 0xb2, 0x9a, 0x22, 0x7f, 0x13,
-	0xda, 0xb4, 0x03, 0x7c, 0x81, 0x66, 0xea, 0x9d, 0x70, 0x27, 0xfa, 0x1c, 0x50, 0x06, 0xdb, 0x04,
-	0x73, 0x2b, 0xa6, 0x24, 0x9a, 0x5f, 0x75, 0x1a, 0x7b, 0xb5, 0x4f, 0x79, 0x60, 0x32, 0xbf, 0x12,
-	0x3f, 0x83, 0xd6, 0xfe, 0x85, 0xa0, 0x0e, 0x54, 0xb3, 0x1b, 0x4d, 0xe4, 0x3a, 0x33, 0x5f, 0x97,
-	0x6b, 0x35, 0xa1, 0xfe, 0xba, 0x5c, 0xab, 0x0b, 0x20, 0xfe, 0x50, 0x80, 0xfa, 0xf6, 0x0f, 0x08,
-	0xea, 0xc3, 0x51, 0x5a, 0x26, 0x99, 0xb9, 0x96, 0x7d, 0xe5, 0x3a, 0x11, 0x1b, 0x74, 0x3f, 0xba,
-	0x31, 0x21, 0x65, 0xf4, 0x32, 0x02, 0x7a, 0x03, 0x02, 0x17, 0xb1, 0x79, 0x44, 0xd8, 0x63, 0x3b,
-	0x0a, 0xa8, 0xcd, 0xcf, 0xfc, 0x5e, 0x57, 0xd8, 0x4a, 0xa9, 0xa9, 0xcd, 0x9e, 0xab, 0x74, 0x1d,
-	0xc4, 0xd7, 0x24, 0xba, 0x8e, 0x42, 0xdf, 0x8f, 0xd3, 0xdb, 0x38, 0xe4, 0xce, 0x49, 0xe2, 0x3b,
-	0x1d, 0xf0, 0x27, 0x32, 0xc7, 0x77, 0xe0, 0x84, 0x3d, 0x36, 0x99, 0xb2, 0xbd, 0xaf, 0x9a, 0xc9,
-	0x4b, 0x54, 0x28, 0xa0, 0x2a, 0x94, 0xd8, 0x47, 0x91, 0x09, 0x12, 0x83, 0x2b, 0xdf, 0xaa, 0xa6,
-	0x50, 0x3a, 0x35, 0xa1, 0xb5, 0x57, 0x55, 0x84, 0x7a, 0xd0, 0xde, 0xff, 0x1b, 0x9f, 0xfd, 0xae,
-	0x1e, 0xdd, 0xba, 0x15, 0xdc, 0x9a, 0xed, 0xe5, 0xe8, 0xbd, 0xfc, 0xee, 0x37, 0x4b, 0x7f, 0x0b,
-	0xef, 0xfa, 0xe1, 0xf2, 0x2c, 0xf7, 0xc7, 0xdf, 0xf1, 0x16, 0xa1, 0x95, 0xfc, 0x91, 0x3f, 0x5b,
-	0xfa, 0xb9, 0xc8, 0xac, 0xc2, 0x9d, 0x5f, 0xfd, 0x37, 0x00, 0x00, 0xff, 0xff, 0x71, 0xc1, 0x79,
-	0xa6, 0x54, 0x10, 0x00, 0x00,
+	// 1956 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0x4d, 0x73, 0xdb, 0xc8,
+	0xd1, 0x7e, 0xf9, 0x21, 0x89, 0x6c, 0x8a, 0x24, 0x34, 0x92, 0x6d, 0x18, 0xde, 0x77, 0xed, 0xc8,
+	0x49, 0xca, 0xfb, 0x45, 0x39, 0xda, 0xd8, 0x95, 0xd4, 0x26, 0xb5, 0x01, 0x49, 0x88, 0x86, 0x4d,
+	0x02, 0xcc, 0x10, 0x94, 0xd7, 0x5b, 0x49, 0xa6, 0x40, 0x70, 0x48, 0xa2, 0x04, 0x02, 0x08, 0x00,
+	0xae, 0x4b, 0xbf, 0x29, 0xe7, 0x9c, 0x53, 0xa9, 0xfd, 0x0f, 0xb9, 0xe5, 0x9c, 0x7f, 0x90, 0x1c,
+	0x72, 0x49, 0xcd, 0xe0, 0x83, 0x20, 0x2d, 0xad, 0x58, 0xc9, 0x85, 0x35, 0x33, 0xfd, 0x3c, 0x3d,
+	0x3d, 0xdd, 0x8d, 0xee, 0x19, 0xc2, 0x63, 0x6b, 0x11, 0x78, 0x4b, 0x7b, 0xb5, 0xf4, 0xc2, 0xb3,
+	0xc9, 0xca, 0x76, 0xa6, 0x34, 0x20, 0x96, 0xe7, 0xce, 0xec, 0x79, 0xcb, 0x0f, 0xbc, 0xc8, 0x43,
+	0xb0, 0x06, 0x48, 0x0f, 0x72, 0x60, 0xcb, 0x5b, 0x2e, 0x3d, 0x37, 0x06, 0x49, 0x8f, 0xe7, 0x9e,
+	0x37, 0x77, 0xe8, 0x19, 0x9f, 0x4d, 0x56, 0xb3, 0xb3, 0xc8, 0x5e, 0xd2, 0x30, 0x32, 0x97, 0x7e,
+	0x02, 0xf8, 0x78, 0x1b, 0xf0, 0x3e, 0x30, 0x7d, 0x9f, 0x06, 0x61, 0x2c, 0x3f, 0xfd, 0xe7, 0x53,
+	0xa8, 0xb7, 0xe3, 0xed, 0x3b, 0x7c, 0x77, 0xf4, 0x39, 0x14, 0xed, 0xa9, 0x58, 0x78, 0x52, 0x78,
+	0x56, 0x3b, 0xff, 0xa8, 0xb5, 0xde, 0xb8, 0xb5, 0x01, 0x6b, 0xa9, 0x53, 0x5c, 0xb4, 0xa7, 0xe8,
+	0x2b, 0x38, 0x98, 0x53, 0x97, 0x06, 0xa6, 0x23, 0x16, 0x39, 0xe5, 0x47, 0xb7, 0x53, 0x7a, 0x31,
+	0x10, 0xa7, 0x0c, 0xf4, 0x1a, 0x0e, 0xbd, 0xc0, 0x5a, 0xd0, 0x30, 0x0a, 0xcc, 0xc8, 0x0b, 0xc4,
+	0x12, 0xd7, 0xf0, 0xd3, 0xdb, 0x35, 0xe8, 0x39, 0x34, 0xde, 0xe0, 0x22, 0x19, 0xaa, 0x66, 0x10,
+	0xd9, 0x33, 0xd3, 0x8a, 0x42, 0xb1, 0xcc, 0x15, 0x3d, 0xbd, 0x5d, 0x91, 0x9c, 0x42, 0xf1, 0x9a,
+	0x85, 0x7e, 0x01, 0xfb, 0x9c, 0x40, 0xc5, 0x3d, 0xce, 0x7f, 0x72, 0x3b, 0xbf, 0xc3, 0x71, 0x38,
+	0xc1, 0xa3, 0x17, 0xb0, 0xc7, 0x63, 0x28, 0xee, 0x73, 0xe2, 0xe3, 0xdb, 0x89, 0x7c, 0x86, 0x63,
+	0x34, 0x6a, 0x03, 0xac, 0x5c, 0x3b, 0x22, 0x11, 0x0d, 0xa3, 0x50, 0x3c, 0xb8, 0xcb, 0xe8, 0xb1,
+	0x6b, 0x47, 0x06, 0x83, 0xe2, 0xea, 0x2a, 0x1d, 0x4a, 0x7f, 0x29, 0x40, 0x51, 0x9d, 0x22, 0x04,
+	0x65, 0xd7, 0x5c, 0x52, 0x1e, 0xb7, 0x2a, 0xe6, 0x63, 0x74, 0x1f, 0xf6, 0x27, 0x81, 0xe9, 0x5a,
+	0x0b, 0x1e, 0x9a, 0x2a, 0x4e, 0x66, 0xe8, 0x05, 0x94, 0xa3, 0x6b, 0x9f, 0x72, 0x77, 0x37, 0x7e,
+	0x28, 0x60, 0xea, 0xb4, 0x65, 0x5c, 0xfb, 0x14, 0x73, 0xf8, 0xe9, 0x25, 0x94, 0xd9, 0x0c, 0x9d,
+	0x80, 0x60, 0xbc, 0x1b, 0x2a, 0x64, 0xac, 0x8d, 0x86, 0x4a, 0x47, 0xbd, 0x50, 0x95, 0xae, 0xf0,
+	0x7f, 0x68, 0x1f, 0x8a, 0x9d, 0xdf, 0x0a, 0x05, 0xd4, 0x00, 0x18, 0xea, 0x23, 0x63, 0x34, 0x6e,
+	0x0f, 0x54, 0x43, 0x28, 0xa2, 0x3a, 0x54, 0x0d, 0x5d, 0xef, 0x77, 0x5e, 0xc9, 0xaa, 0x26, 0x94,
+	0xd0, 0x11, 0xd4, 0x55, 0xed, 0x42, 0xc7, 0x03, 0xd9, 0x50, 0x75, 0x4d, 0xee, 0x0b, 0x65, 0xe9,
+	0x1f, 0x65, 0x38, 0x48, 0x52, 0x03, 0xbd, 0x84, 0x8a, 0x15, 0xd8, 0x91, 0x6d, 0x99, 0x4e, 0x92,
+	0x82, 0x52, 0x2b, 0xce, 0xe0, 0x56, 0x9a, 0xc1, 0xad, 0xb6, 0xe7, 0x39, 0x97, 0xa6, 0xb3, 0xa2,
+	0x38, 0xc3, 0x22, 0x1d, 0x6a, 0xd4, 0xfd, 0xce, 0x0e, 0x3c, 0x77, 0x49, 0xdd, 0x88, 0x9f, 0xb7,
+	0x71, 0xfe, 0xc5, 0x9d, 0xa9, 0xd8, 0x52, 0xd6, 0x24, 0x9c, 0xd7, 0x80, 0xba, 0x50, 0x09, 0x56,
+	0x2e, 0x79, 0xbf, 0xa0, 0x6e, 0x92, 0x96, 0x9f, 0xdc, 0xad, 0x0d, 0xaf, 0xdc, 0xb7, 0x0b, 0xea,
+	0xe2, 0x83, 0x20, 0x1e, 0xa0, 0xaf, 0xa1, 0x3e, 0x09, 0xbc, 0x2b, 0xea, 0x92, 0x09, 0x9d, 0x79,
+	0x01, 0x4d, 0x12, 0xf3, 0xc3, 0x33, 0x19, 0xe9, 0x67, 0x8b, 0x0f, 0x63, 0x42, 0x9b, 0xe3, 0xd1,
+	0xa7, 0x70, 0x14, 0x4e, 0xaf, 0x88, 0x65, 0x5a, 0x0b, 0x4a, 0xbe, 0xa3, 0x41, 0x68, 0x7b, 0x2e,
+	0xcf, 0xce, 0x3d, 0xdc, 0x0c, 0xa7, 0x57, 0x1d, 0xb6, 0x7e, 0x19, 0x2f, 0x4b, 0x7f, 0x2b, 0xc0,
+	0x41, 0x62, 0x01, 0x6a, 0x43, 0x79, 0xe9, 0x4d, 0xe3, 0x74, 0x68, 0x9c, 0xb7, 0x76, 0x36, 0xbd,
+	0x35, 0xf0, 0xa6, 0x14, 0x73, 0x2e, 0x7a, 0x0a, 0xf5, 0x99, 0xed, 0x50, 0xe2, 0x9b, 0x51, 0x44,
+	0x03, 0x37, 0x14, 0x8b, 0x4f, 0x4a, 0xcf, 0xaa, 0xf8, 0x90, 0x2d, 0x0e, 0x93, 0xb5, 0xd3, 0x09,
+	0x94, 0x19, 0x85, 0x25, 0xc5, 0x40, 0xef, 0x6e, 0x27, 0x45, 0x03, 0x40, 0xee, 0xbf, 0x95, 0xdf,
+	0x8d, 0x08, 0x1e, 0x6b, 0x42, 0x01, 0x49, 0x70, 0x5f, 0xd7, 0xfa, 0xef, 0xd8, 0x8c, 0xe8, 0x1a,
+	0xb9, 0x50, 0xfb, 0x0a, 0x19, 0xc8, 0x46, 0xe7, 0x95, 0x50, 0x44, 0x22, 0x9c, 0x68, 0xfa, 0x0d,
+	0x92, 0xd2, 0x69, 0x0f, 0x6a, 0xb9, 0x38, 0xa1, 0x47, 0xf0, 0x40, 0xd1, 0x2e, 0x55, 0xac, 0x6b,
+	0x03, 0x45, 0x33, 0x3e, 0xdc, 0x71, 0x88, 0xf5, 0xee, 0xb8, 0xc3, 0xd2, 0x4b, 0x28, 0xa0, 0x1a,
+	0x1c, 0x8c, 0x0c, 0xb9, 0xa7, 0x6a, 0x3d, 0xa1, 0x28, 0xfd, 0xab, 0x08, 0x87, 0xf9, 0x12, 0x82,
+	0x24, 0xa8, 0x58, 0x0b, 0xdb, 0x99, 0x06, 0xd4, 0x15, 0x0b, 0xfc, 0x74, 0xd9, 0x1c, 0xfd, 0x06,
+	0x1a, 0x73, 0x3b, 0xb2, 0x1d, 0x1a, 0x12, 0x56, 0x72, 0xed, 0x28, 0x29, 0x70, 0x0f, 0xf3, 0xce,
+	0xec, 0xc5, 0x88, 0x0e, 0x07, 0xe0, 0xfa, 0x3c, 0x3f, 0x45, 0x5f, 0x43, 0x63, 0x4e, 0x83, 0xc0,
+	0x8e, 0x88, 0xb5, 0x30, 0xdd, 0x39, 0x0d, 0xc5, 0xd2, 0x93, 0xd2, 0xb3, 0xda, 0xb9, 0xb8, 0xa1,
+	0x81, 0x23, 0x3a, 0x1c, 0x80, 0xeb, 0xf3, 0xdc, 0x2c, 0x44, 0x7f, 0x84, 0xfb, 0x33, 0xcf, 0x71,
+	0xbc, 0xf7, 0xc4, 0x73, 0xc9, 0x46, 0xa5, 0x8c, 0xf3, 0xe8, 0xab, 0xdd, 0x2a, 0x65, 0xeb, 0x82,
+	0x2b, 0xd1, 0xdd, 0x8d, 0xf2, 0x79, 0x32, 0xbb, 0x61, 0x55, 0x1a, 0xc3, 0xc9, 0x4d, 0xe8, 0x1b,
+	0xeb, 0xcb, 0x27, 0x20, 0x98, 0xef, 0x4d, 0x76, 0x3c, 0x6f, 0xe9, 0x3b, 0x34, 0x62, 0xb9, 0xc9,
+	0x7c, 0x54, 0xc1, 0x4d, 0xbe, 0xde, 0xc9, 0x96, 0xa5, 0xbf, 0x03, 0x54, 0xb3, 0x9a, 0x8b, 0xde,
+	0x40, 0xd5, 0x0f, 0x28, 0xab, 0x81, 0x51, 0x98, 0xa4, 0xe8, 0x17, 0x3b, 0xd4, 0xea, 0xd6, 0x30,
+	0x25, 0xe1, 0x35, 0x1f, 0x7d, 0x03, 0x8d, 0xb4, 0x84, 0x13, 0x56, 0xa7, 0xe2, 0x3c, 0x6d, 0x9c,
+	0xff, 0x6c, 0x17, 0x8d, 0xe9, 0x88, 0x15, 0xb6, 0x10, 0xd7, 0xcd, 0xfc, 0x14, 0xb5, 0xe0, 0x38,
+	0xdb, 0x86, 0xcc, 0x43, 0x32, 0x59, 0x59, 0x57, 0x34, 0xe2, 0xe5, 0xa0, 0x8a, 0x8f, 0x32, 0x51,
+	0x2f, 0x6c, 0x73, 0x01, 0xc3, 0x67, 0xcd, 0x24, 0x87, 0x2f, 0xc7, 0xf8, 0x4c, 0x94, 0xe1, 0x7f,
+	0x07, 0x47, 0xfe, 0x6a, 0xe2, 0xd8, 0xe1, 0x82, 0xac, 0x5b, 0xd7, 0x1e, 0x4f, 0x91, 0xb3, 0x9d,
+	0xdc, 0x11, 0x93, 0x55, 0x77, 0xe6, 0x61, 0x21, 0xd1, 0xb4, 0x76, 0xf2, 0x1f, 0xa0, 0x69, 0xbb,
+	0xfe, 0x2a, 0xca, 0xe9, 0xde, 0xe7, 0xba, 0x5f, 0xec, 0xa2, 0x5b, 0x65, 0xd4, 0x74, 0xca, 0x77,
+	0x68, 0xd8, 0xf9, 0xa5, 0x50, 0xfa, 0x6b, 0x01, 0x6a, 0x39, 0x0b, 0x58, 0xa9, 0x4a, 0x4f, 0xb3,
+	0x3e, 0x7b, 0x9c, 0x2e, 0xcd, 0x44, 0x90, 0x9d, 0xfc, 0x12, 0xea, 0x29, 0xf6, 0x7f, 0x0c, 0xd9,
+	0x61, 0xa2, 0x67, 0x1d, 0xb1, 0xb5, 0x0d, 0x8e, 0x67, 0x99, 0x3c, 0x29, 0xd3, 0x88, 0xa5, 0x56,
+	0xf4, 0x13, 0x81, 0xf4, 0xe7, 0x02, 0x1c, 0x7d, 0x70, 0x52, 0x64, 0xc2, 0xf1, 0xa6, 0xe7, 0xb8,
+	0x91, 0x49, 0xa2, 0xfe, 0x17, 0x36, 0x1e, 0x6d, 0x78, 0x8e, 0xf7, 0xd0, 0x5f, 0xc3, 0xa3, 0xad,
+	0x2d, 0x72, 0xf6, 0xa6, 0x95, 0x56, 0xdc, 0xe0, 0xad, 0xcd, 0x0e, 0x4f, 0x55, 0xa8, 0x66, 0xdf,
+	0x02, 0x7a, 0x08, 0xf7, 0x86, 0x58, 0x69, 0x8f, 0xd5, 0xbe, 0x31, 0xda, 0xaa, 0x86, 0x00, 0xfb,
+	0xc3, 0x71, 0xbb, 0xaf, 0x76, 0xe2, 0x4a, 0x38, 0xc4, 0xea, 0xa5, 0x6c, 0x28, 0x42, 0x11, 0x55,
+	0xa0, 0xac, 0xe9, 0x9a, 0x22, 0x94, 0x4e, 0xbf, 0x2f, 0x41, 0x7d, 0xc3, 0x5c, 0xf4, 0x31, 0x48,
+	0x32, 0x36, 0xd4, 0x0b, 0xb9, 0x63, 0x10, 0xd6, 0xe8, 0xb7, 0x95, 0xd6, 0xa1, 0xaa, 0x0e, 0xe4,
+	0x9e, 0x42, 0xbe, 0x55, 0x87, 0x42, 0x01, 0x3d, 0x80, 0x63, 0x43, 0x19, 0x19, 0x64, 0x3c, 0xec,
+	0xca, 0x86, 0x42, 0x86, 0xf2, 0xbb, 0xbe, 0x2e, 0x77, 0x85, 0x22, 0x42, 0xd0, 0x90, 0xc7, 0x86,
+	0xce, 0x85, 0xac, 0x9e, 0x8f, 0x84, 0x12, 0x2b, 0xcf, 0x86, 0x9c, 0xcd, 0xcb, 0x8c, 0x3c, 0x54,
+	0x35, 0x4d, 0xe9, 0x92, 0xde, 0x98, 0xe1, 0xb8, 0xe2, 0x91, 0xb0, 0x87, 0x0e, 0xa1, 0x72, 0xa1,
+	0xe2, 0xc1, 0x5b, 0x19, 0x2b, 0xc2, 0x3e, 0x6a, 0x42, 0x8d, 0x1f, 0xb0, 0x4b, 0xfa, 0x7a, 0x6f,
+	0x24, 0x1c, 0xa0, 0x63, 0x68, 0x76, 0x5e, 0x61, 0x7d, 0xa0, 0xe8, 0x23, 0xd2, 0xd1, 0xb5, 0x0b,
+	0xb5, 0x27, 0x54, 0x98, 0xf2, 0xce, 0x50, 0x21, 0x58, 0x19, 0xea, 0xd8, 0x10, 0xaa, 0xcc, 0x80,
+	0xd8, 0x50, 0x19, 0x77, 0x5e, 0xa9, 0x97, 0xca, 0x48, 0x00, 0xf4, 0x11, 0x88, 0x63, 0xed, 0x52,
+	0xc1, 0xfc, 0x30, 0x44, 0xc7, 0x5d, 0x05, 0xab, 0x5a, 0x8f, 0xdb, 0x23, 0xd4, 0x58, 0x7f, 0xba,
+	0x45, 0x76, 0xc8, 0xdc, 0x12, 0x6f, 0x49, 0x3a, 0x7d, 0x59, 0xeb, 0x91, 0xb7, 0x32, 0xd6, 0x54,
+	0xad, 0x37, 0x8a, 0xe5, 0xf5, 0x2d, 0xcd, 0xfd, 0xfe, 0xe5, 0x80, 0x0c, 0x7b, 0x7a, 0x2c, 0x6d,
+	0xa0, 0xc7, 0xf0, 0x28, 0x27, 0x4d, 0x14, 0xc9, 0x17, 0xdd, 0x04, 0xd0, 0x44, 0xff, 0x0f, 0x0f,
+	0x6f, 0x17, 0x0b, 0x1b, 0xe2, 0x37, 0x0a, 0xd6, 0x94, 0x7e, 0x4e, 0x7c, 0x24, 0xfd, 0x18, 0xf6,
+	0xe3, 0x2b, 0x29, 0x6b, 0x69, 0xb6, 0xcb, 0x7a, 0x73, 0x72, 0x83, 0xaa, 0xe0, 0x6c, 0x2e, 0xfd,
+	0xbb, 0x0a, 0x7b, 0x3c, 0x65, 0xd1, 0x73, 0xa8, 0xae, 0x42, 0x4a, 0x66, 0x8e, 0x39, 0x0f, 0x79,
+	0xe7, 0xab, 0x9d, 0x1f, 0xe7, 0x13, 0x7b, 0x1c, 0xd2, 0x0b, 0xc7, 0x9c, 0xe3, 0xca, 0x2a, 0x1e,
+	0x84, 0xe8, 0x2d, 0x34, 0x7d, 0x2f, 0x88, 0xcc, 0x39, 0x25, 0x7e, 0xe0, 0xb1, 0x3b, 0x40, 0xd2,
+	0x0f, 0x5b, 0x77, 0x5c, 0x76, 0x5b, 0xc3, 0x98, 0x36, 0x8c, 0x59, 0xb8, 0xe1, 0x6f, 0xcc, 0xd1,
+	0x4b, 0xa8, 0xd9, 0x4b, 0xa6, 0x36, 0xae, 0x04, 0x25, 0x5e, 0x09, 0xee, 0xe5, 0x95, 0xaa, 0x4c,
+	0xcc, 0x2f, 0xa2, 0x60, 0xa7, 0xc3, 0x10, 0xf5, 0x41, 0xb0, 0xdd, 0x30, 0x32, 0x1d, 0x87, 0xf8,
+	0xa6, 0x75, 0x65, 0xb2, 0xfe, 0x5a, 0xbe, 0xeb, 0x46, 0x8b, 0x57, 0xee, 0xc8, 0xa7, 0x16, 0x6e,
+	0x26, 0xd4, 0x61, 0xc2, 0x44, 0x9f, 0xc1, 0x11, 0xeb, 0x62, 0xec, 0xbe, 0x13, 0x79, 0x9e, 0x63,
+	0x2d, 0x4c, 0x3b, 0xbe, 0x68, 0x55, 0xb0, 0x90, 0x08, 0x8c, 0x74, 0x1d, 0x3d, 0x87, 0x13, 0xd3,
+	0xf7, 0x9d, 0x6b, 0xb2, 0xd5, 0xde, 0xf7, 0x39, 0x1e, 0x71, 0x59, 0x6f, 0xa3, 0x93, 0x7f, 0x09,
+	0x95, 0xcc, 0xc8, 0x03, 0xee, 0xee, 0x07, 0x79, 0x23, 0x13, 0x33, 0x78, 0x9d, 0xcd, 0x80, 0xe8,
+	0x27, 0xd0, 0x48, 0x6d, 0x0a, 0xbd, 0x55, 0x60, 0x51, 0x11, 0xf8, 0x06, 0xf5, 0x64, 0x75, 0xc4,
+	0x17, 0xd1, 0xe7, 0x80, 0x52, 0xd8, 0xca, 0x9f, 0x9a, 0x11, 0x25, 0xe1, 0xf4, 0x4a, 0xac, 0x6d,
+	0xd8, 0x3e, 0xe6, 0x82, 0xd1, 0xf4, 0x0a, 0xbd, 0x02, 0x60, 0x37, 0xca, 0x18, 0x29, 0x1e, 0xde,
+	0x75, 0xb5, 0x8d, 0x43, 0x38, 0x9a, 0x5e, 0xc5, 0x1a, 0x70, 0x35, 0x4c, 0x87, 0xe8, 0xf7, 0x70,
+	0x94, 0x06, 0x60, 0xed, 0xb2, 0x3a, 0x57, 0xf8, 0xfc, 0x2e, 0x85, 0x6a, 0x4c, 0xcc, 0x5c, 0x8a,
+	0xd3, 0x58, 0xae, 0x9d, 0x6c, 0xc1, 0xbd, 0xed, 0xf8, 0xf2, 0x07, 0xb2, 0xd8, 0xe0, 0x5b, 0x9c,
+	0xed, 0xb8, 0x45, 0x1a, 0x61, 0x7c, 0xbc, 0x15, 0x72, 0x06, 0x46, 0x1a, 0x1c, 0xf2, 0xa7, 0x18,
+	0xe1, 0x89, 0x15, 0x8a, 0x4d, 0xae, 0xfb, 0xb3, 0xbb, 0x74, 0xf3, 0x5f, 0x9e, 0x96, 0x21, 0xae,
+	0x4d, 0xd6, 0x13, 0xe9, 0x53, 0x68, 0x6c, 0xa6, 0x3b, 0x12, 0xe1, 0x20, 0xfd, 0x5e, 0xe2, 0x66,
+	0x98, 0x4e, 0xa5, 0x73, 0xa8, 0x66, 0x7e, 0xbd, 0x21, 0xd6, 0x85, 0x1b, 0x62, 0x2d, 0xfd, 0x12,
+	0x84, 0x6d, 0xd7, 0xed, 0x4a, 0xfd, 0x53, 0x01, 0x9a, 0x5b, 0x3e, 0xd9, 0x91, 0x8a, 0x7e, 0x15,
+	0x3f, 0x86, 0x42, 0x9f, 0x5a, 0xc9, 0xd3, 0x6a, 0x87, 0x4f, 0x8c, 0x3d, 0x82, 0xd8, 0x60, 0x23,
+	0xf7, 0x4b, 0x3b, 0xe6, 0xbe, 0xa4, 0x40, 0x2d, 0xe7, 0xe4, 0xed, 0x22, 0x51, 0xd8, 0xb1, 0x48,
+	0xbc, 0x2e, 0x57, 0x2a, 0x42, 0xf5, 0x75, 0xb9, 0x52, 0x15, 0x40, 0xfa, 0xbe, 0x00, 0xd5, 0xec,
+	0x09, 0x8d, 0xba, 0x70, 0x94, 0x6c, 0x46, 0x26, 0x8e, 0x69, 0x5d, 0x39, 0x76, 0xc8, 0xae, 0x6a,
+	0x3f, 0x68, 0x9e, 0x90, 0x30, 0xda, 0x29, 0x01, 0xbd, 0x01, 0x81, 0xb7, 0xe1, 0x69, 0x48, 0x32,
+	0x0f, 0xed, 0xed, 0xea, 0xa1, 0x46, 0x42, 0x4d, 0xe6, 0xec, 0xc1, 0x45, 0x97, 0x7e, 0x74, 0x4d,
+	0xc2, 0xeb, 0x30, 0xf0, 0xbc, 0x28, 0xa9, 0x27, 0x87, 0x7c, 0x71, 0x14, 0xaf, 0x9d, 0x5e, 0xf0,
+	0x47, 0x1e, 0xc7, 0x8b, 0x70, 0xc2, 0x9e, 0x4b, 0xac, 0x37, 0x7f, 0xd8, 0xf7, 0xe3, 0xb7, 0x94,
+	0x50, 0x40, 0x07, 0x50, 0x62, 0x83, 0x22, 0x6b, 0xa9, 0x0c, 0xae, 0x7c, 0xa3, 0x1a, 0x42, 0xe9,
+	0xd4, 0x80, 0xc6, 0x86, 0x55, 0x21, 0x6a, 0x43, 0x73, 0xf3, 0x8f, 0xa8, 0xb4, 0x33, 0x3c, 0xbc,
+	0xf5, 0x28, 0xb8, 0x31, 0xd9, 0xd0, 0xd1, 0x7e, 0xf9, 0xed, 0xcf, 0xe7, 0x5e, 0x06, 0x6f, 0x79,
+	0xc1, 0xfc, 0x2c, 0xf7, 0xd7, 0x95, 0xed, 0xce, 0x02, 0x33, 0xfe, 0x2b, 0xea, 0x6c, 0xee, 0xe5,
+	0x24, 0x93, 0x7d, 0xbe, 0xf8, 0xe5, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x3c, 0x62, 0x14, 0xb1,
+	0x16, 0x13, 0x00, 0x00,
 }
diff --git a/src/chromiumos/builder_config.proto b/src/chromiumos/builder_config.proto
index 12e5c40..8d69425 100644
--- a/src/chromiumos/builder_config.proto
+++ b/src/chromiumos/builder_config.proto
@@ -257,13 +257,16 @@
     PortageProfile portage_profile = 2;
 
     // Image types to build.
+    // DEPRECATED: Use steps.build_images.image_types.
     repeated ImageType image_types = 3;
 
     // Controls the running of the install packages step.
+    // DEPRECATED: Use steps.install_packages_conf.run_spec.
     RunSpec install_packages = 4;
 
     // Compile toolchain from source (true), or use bin packages (false).  This
     // applies to the install toolchain step only.
+    // DEPRECATED: Use steps.install_toolchain.compile_source.
     bool compile_toolchain = 5;
 
     // Whether to apply gerrit changes, if any. Use case is to build without
@@ -271,17 +274,60 @@
     bool apply_gerrit_changes = 6;
 
     // Packages to build, or empty to build all packages.
+    // DEPRECATED: Use steps.install_packages_conf.packages.
     repeated PackageInfo packages = 7;
 
     reserved 8, 9;
 
     // Build packages from source (true), or use bin packages (false).  This
     // applies to the install packages step only.
+    // DEPRECATED: Use steps.install_packages_conf.compile_source.
     bool compile_source = 10;
 
     // Compile sdk packages from source (true) or use prebuilts (false).  This
     // applies to the update sdk step only.
+    // DEPRECATED: Use steps.sdk_update.compile_source.
     bool compile_update_sdk = 11;
+
+    // Below here are configuration specifications for the steps that call the
+    // Build API endpoints.
+    //
+    // TODO(crbug/1038975): remove DEPRECATED fields above.
+    //
+    // Controls for the call to SdkService.Update.
+    message SdkUpdate {
+      // Whether to compile from source (vs using prebuilts when able.)
+      bool compile_source = 1;
+    }
+    SdkUpdate sdk_update = 12;
+
+    // Controls for the call to SysrootService.InstallToolchain.
+    message InstallToolchain {
+      // Whether to compile from source (vs using prebuilts when able.)
+      bool compile_source = 1;
+    }
+    InstallToolchain install_toolchain = 13;
+
+    // Controls for the call to InstallPackages.
+    message InstallPackages {
+      // Whether to compile from source (vs using prebuilts when able.)
+      bool compile_source = 1;
+
+      // Controls the running of the install packages step.
+      RunSpec run_spec = 2;
+
+      // Packages to build, or empty to build all packages.
+      repeated PackageInfo packages = 3;
+    }
+    // TODO(crbug/1038975): rename this to install_packages once the RunSpec is
+    // gone above.
+    InstallPackages install_packages_conf = 14;
+
+    message BuildImages {
+      // Image types to build.
+      repeated ImageType image_types = 1;
+    }
+    BuildImages build_images = 15;
   }
   Build build = 6;