Support for Q_OS_ANDROID_EMBEDDED and android-embedded builds

The Embedded Android build (Boot to Qt Android injection) is defined by
having both Q_OS_ANDROID and Q_OS_ANDROID_EMBEDDED flags defined,
as well as having Qt config android-embedded.
Those flags are set in mkspecs when building for embedded Android.
This commit enables the possibility to build embedded Android builds.
(i.e. Qt build for Android baselayer only, without JNI)

Change-Id: I2ded43d7ed46a99ba70301f07a791ed4a148c6c0
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

examples/nfc/corkboard/corkboard.pro

@@ -13,7 +13,9 @@ OTHER_FILES += \
     corkboards.qml \
     Mode.qml
 
+!android-embedded {
 ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
+}
 
 target.path = $$[QT_INSTALL_EXAMPLES]/nfc/corkboard
 INSTALLS += target

src/bluetooth/bluetooth.pro

@@ -110,7 +110,7 @@ qtConfig(bluez) {
             qlowenergycontroller_p.cpp
     }
 
-} else:android {
+} else:android:!android-embedded {
     include(android/android.pri)
     DEFINES += QT_ANDROID_BLUETOOTH
     QT_FOR_PRIVATE += core-private androidextras

src/nfc/nfc.pro

@@ -79,7 +79,7 @@ linux:!android:qtHaveModule(dbus) {
 
     include(neard/neard.pri)
 
-} else:android {
+} else:android:!android-embedded {
     NFC_BACKEND_AVAILABLE = yes
     DEFINES += QT_ANDROID_NFC
     ANDROID_PERMISSIONS = \

tests/auto/qbluetoothserviceinfo/qbluetoothserviceinfo.pro

@@ -6,6 +6,6 @@ QT = core concurrent bluetooth testlib
 osx:QT += widgets
 
 
-android {
+android:!android-embedded {
     DEFINES += QT_ANDROID_BLUETOOTH
 }

tests/auto/qbluetoothsocket/qbluetoothsocket.pro

@@ -11,6 +11,6 @@ OTHER_FILES += \
 
 osx {
     DEFINES += QT_OSX_BLUETOOTH
-} else: android {
+} else:android:!android-embedded {
     DEFINES += QT_ANDROID_BLUETOOTH
 }