Android: Be explicit on whether gdbserver should be added to the package

Change-Id: I2a03e243678263441d64884dbd5245b8ec2ba9c7
Task-number: QTCREATORBUG-13035
Reviewed-by: BogDan Vatra <bogdan@kdab.com>

src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp

@@ -234,6 +234,13 @@ bool QmakeAndroidBuildApkStep::init()
 
     QStringList argumentsPasswordConcealed = arguments;
 
+    if (version->qtVersion() >= QtSupport::QtVersionNumber(5, 6, 0)) {
+        if (bc->buildType() == ProjectExplorer::BuildConfiguration::Debug)
+            arguments << QLatin1String("--gdbserver");
+        else
+            arguments << QLatin1String("--no-gdbserver");
+    }
+
     if (m_signPackage) {
         arguments << QLatin1String("--sign")
                   << m_keystorePath.toString()