[CMake] Include ICU for stubs

`stdlib/public/stubs` includes `unicode/ustring.h`,
`unicode/ucol.h`, `unicode/ucoleitr.h`, and `unicode/uiter.h`.

Also, `stubs` comes before `core` in the CMake configuration order.
As a result, ICU includes are not configured in time for `stubs`.
This causes an error when building Swift for Android.

This behavior was introduced in d227aeb. This commit reverts the
include order change.

Author: modocache

stdlib/public/core/CMakeLists.txt

@@ -160,8 +160,6 @@ else()
   find_package(ICU REQUIRED COMPONENTS uc i18n)
   list(APPEND swift_core_private_link_libraries
       ${ICU_UC_LIBRARY} ${ICU_I18N_LIBRARY})
-  include_directories(
-      ${ICU_UC_INCLUDE_DIR} ${ICU_I18N_INCLUDE_DIR})
 endif()
 
 if(CMAKE_SYSTEM_NAME STREQUAL "CYGWIN")

stdlib/public/stubs/CMakeLists.txt

@@ -9,8 +9,11 @@ if(SWIFT_HOST_VARIANT MATCHES "${SWIFT_DARWIN_VARIANTS}")
   set(LLVM_OPTIONAL_SOURCES
       UnicodeNormalization.cpp)
 else()
+  find_package(ICU REQUIRED COMPONENTS uc i18n)
   set(swift_stubs_unicode_normalization_sources
       UnicodeNormalization.cpp)
+  include_directories(
+      ${ICU_UC_INCLUDE_DIR} ${ICU_I18N_INCLUDE_DIR})
 endif()
 
 add_swift_library(swiftStdlibStubs OBJECT_LIBRARY TARGET_LIBRARY