Merge remote-tracking branch 'origin/4.12'

Conflicts:
	src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp

Change-Id: I4a90920e52dbbe9eb46aef3437ee3c5a6e7b31c6

src/plugins/android/androidbuildapkstep.cpp

@@ -222,9 +222,11 @@ bool AndroidBuildApkStep::init()
         m_inputFile = node->data(Constants::AndroidDeploySettingsFile).toString();
 
     if (m_inputFile.isEmpty()) {
+        qCDebug(buildapkstepLog) << "no input file" << rc << node << buildKey;
         m_skipBuilding = true;
         return true;
     }
+    m_skipBuilding = false;
 
     if (m_buildTargetSdk.isEmpty()) {
         emit addOutput(tr("Android build SDK not defined. Check Android settings."),