Extend --boot-timeout for acloud create_gf.

Bug: 157114314
Test: acloud-dev create_gf --boot-timeout 20 --build-id 6238115 --build-target \
sdk_gphone_x86_64-userdebug --branch git_master
Change-Id: Ia9ce9cfd2d9e69229358924852e559d0f174c6d0

Change-Id: Iad4c261f6639149da060d0a3d76d903b398cf189
diff --git a/public/acloud_main.py b/public/acloud_main.py
index cb80bff..b2d19da 100644
--- a/public/acloud_main.py
+++ b/public/acloud_main.py
@@ -405,7 +405,8 @@
             serial_log_file=args.serial_log_file,
             autoconnect=args.autoconnect,
             tags=args.tags,
-            report_internal_ip=args.report_internal_ip)
+            report_internal_ip=args.report_internal_ip,
+            boot_timeout_secs=args.boot_timeout_secs)
     elif args.which == delete_args.CMD_DELETE:
         report = delete.Run(args)
     elif args.which == list_args.CMD_LIST:
diff --git a/public/actions/create_goldfish_action.py b/public/actions/create_goldfish_action.py
index 719e91b..3b2c10c 100644
--- a/public/actions/create_goldfish_action.py
+++ b/public/actions/create_goldfish_action.py
@@ -242,7 +242,8 @@
                   autoconnect=False,
                   branch=None,
                   tags=None,
-                  report_internal_ip=False):
+                  report_internal_ip=False,
+                  boot_timeout_secs=None):
     """Create one or multiple Goldfish devices.
 
     Args:
@@ -267,12 +268,13 @@
               ["http-server", "https-server"]
         report_internal_ip: Boolean to report the internal ip instead of
                             external ip.
+        boot_timeout_secs: Integer, the maximum time in seconds used to
+                           wait for the AVD to boot.
 
     Returns:
         A Report instance.
     """
     client_adb_port = None
-    boot_timeout_secs = None
     if avd_spec:
         cfg = avd_spec.cfg
         build_target = avd_spec.remote_image[constants.BUILD_TARGET]