Snap for 5228332 from 3173e4c2 to qt-release

Change-Id: If5a1cdc13379a159d676f3ec1966d9d9dd80f9dd

Android.mk

@@ -295,6 +295,15 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_SHARED_LIBRARIES += libssh libssl libcrypto libdl libz libcutils
 
+# libc.bootstrap is available/required since Q
+ifneq ($(PLATFORM_VERSION_CODENAME)|$(call math_lt,$(PLATFORM_SDK_VERSION),29),REL|true)
+# This filter is for old branches that does not have math_lt macro
+# This is equivalently PLATFORM_SDK_VERSION > 27
+ifeq ($(filter 14 15 16 17 18 19 20 21 22 23 24 25 26 27,$(PLATFORM_SDK_VERSION)),)
+LOCAL_SHARED_LIBRARIES += libc.bootstrap
+endif
+endif
+
 include $(BUILD_EXECUTABLE)
 
 ###################### ssh-keygen ######################