Merge changes from topics "apex_available_name-bp2build", "variant_version-bp2build"

* changes:
  add variant_version to bp2build apex converter
  add apex_available_name to bp2build apex converter
diff --git a/apex/apex.go b/apex/apex.go
index 492e4f0..737e656 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -3530,6 +3530,8 @@
 	Logging_parent        *string
 	Tests                 bazel.LabelListAttribute
 	Base_apex_name        *string
+	Apex_available_name   *string
+	Variant_version       *string
 }
 
 type convertedNativeSharedLibs struct {
@@ -3680,6 +3682,8 @@
 		Package_name:          packageName,
 		Logging_parent:        loggingParent,
 		Tests:                 testsAttrs,
+		Apex_available_name:   a.properties.Apex_available_name,
+		Variant_version:       a.properties.Variant_version,
 	}
 
 	props := bazel.BazelTargetModuleProperties{