Merge remote-tracking branch 'origin/master' into master-next

Author: swift-ci

stdlib/public/Platform/CMakeLists.txt

@@ -95,7 +95,7 @@ foreach(sdk ${SWIFT_SDKS})
       set(GLIBC_ARCH_INCLUDE_PATH "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}${GLIBC_ARCH_INCLUDE_PATH}")
     endif()
 
-    if(sdk STREQUAL ANDROID)
+    if(${sdk} STREQUAL ANDROID)
       set(glibc_modulemap_source "bionic.modulemap.gyb")
     else()
       set(glibc_modulemap_source "glibc.modulemap.gyb")