[BEAM-12447] Upgrade cloud build client and add/cleanup options

sdks/python/apache_beam/options/pipeline_options.py

@@ -1149,14 +1149,11 @@ def _add_argparse_args(cls, parser):
             'can also subclass SdkContainerImageBuilder and use that to build '
             'in other environments.'))
     parser.add_argument(
-        '--prebuild_sdk_container_base_image',
+        '--cloud_build_machine_type',
         default=None,
         help=(
-            'The base image to use when pre-building the sdk container image '
-            'with dependencies, if not specified, by default the released '
-            'public apache beam python sdk container image corresponding to '
-            'the sdk version will be used, if a dev sdk is used the base '
-            'image will default to the latest released sdk image.'))
+            'If specified, use the machine type explicitly when prebuilding'
+            'SDK container image on Google Cloud Build.'))
     parser.add_argument(
         '--docker_registry_push_url',
         default=None,

sdks/python/apache_beam/runners/dataflow/internal/clients/cloudbuild/__init__.py

@@ -25,11 +25,9 @@
 # pylint: disable=wrong-import-order, wrong-import-position
 try:
   from apitools.base.py import *
-
   from apache_beam.runners.dataflow.internal.clients.cloudbuild.cloudbuild_v1_client import *
   from apache_beam.runners.dataflow.internal.clients.cloudbuild.cloudbuild_v1_messages import *
 except ImportError:
   pass
-# pylint: enable=wrong-import-order, wrong-import-position
 
 __path__ = pkgutil.extend_path(__path__, __name__)