Merge "Fix "avd name" bug."
diff --git a/android/console.c b/android/console.c
index 0affb46..505d331 100644
--- a/android/console.c
+++ b/android/console.c
@@ -134,9 +134,6 @@
 ControlClient core_ui_ctl_client = NULL;
 #endif  // CONFIG_STANDALONE_CORE
 
-/* -android-avdname option value. Defined in vl-android.c */
-extern char* android_op_avd_name;
-
 static int
 control_global_add_redir( ControlGlobal  global,
                           int            host_port,
@@ -2207,7 +2204,7 @@
 static int
 do_avd_name( ControlClient  client, char*  args )
 {
-    control_write( client, "%s\r\n", android_op_avd_name);
+    control_write( client, "%s\r\n", android_hw->avd_name);
     return 0;
 }