Was temporarily disabled for 2.7 and not supposed to be merged into 2.8
This reverts commit d3e69915.

Conflicts:
	src/plugins/android/androiddebugsupport.cpp

Change-Id: I669d587535545846b5fcbdadd0d066f1758a3644