Android: Simplify deploy step widget setup

Remove the nested QGroupBox, inline code into only callers, etc.
Also use better display name for deploy step widget.

Change-Id: I579810c04dea032a98ba28db6de035048f801f75
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>

src/plugins/android/androiddeployqtstep.h

@@ -36,10 +36,6 @@
 
 namespace Utils { class QtcProcess; }
 
-QT_BEGIN_NAMESPACE
-class QAbstractItemModel;
-QT_END_NAMESPACE
-
 namespace Android {
 namespace Internal {
 
@@ -52,7 +48,6 @@ public:
 class AndroidDeployQtStep : public ProjectExplorer::BuildStep
 {
     Q_OBJECT
-    friend class AndroidDeployQtStepFactory;
 
     enum DeployErrorCode
     {