Android: Fix deployment to wrong avd

We used to only identify the avd by api level and abi. That was
obviously incorrect, but at the time I didn't know how to get
the actual avd name from a running emulator.

Turns out this is reasonable easy via telnet on the emulator port.

Change-Id: I387901a5294674f44399c0726abcc9feea221e8d
Task-number: QTCREATORBUG-13095
Reviewed-by: BogDan Vatra <bogdan@kde.org>

src/plugins/android/androidsettingswidget.cpp

@@ -79,7 +79,7 @@ QModelIndex AvdModel::indexForAvdName(const QString &avdName) const
 
 QString AvdModel::avdName(const QModelIndex &index) const
 {
-    return m_list.at(index.row()).serialNumber;
+    return m_list.at(index.row()).avdname;
 }
 
 QVariant AvdModel::data(const QModelIndex &index, int role) const
@@ -88,7 +88,7 @@ QVariant AvdModel::data(const QModelIndex &index, int role) const
         return QVariant();
     switch (index.column()) {
         case 0:
-            return m_list[index.row()].serialNumber;
+            return m_list[index.row()].avdname;
         case 1:
             return QString::fromLatin1("API %1").arg(m_list[index.row()].sdk);
         case 2: {