Fix switches.cc patch

Author: jslater89

switches.patch

@@ -1,25 +1,4 @@
 +++ switches.cc
-@@ -66,20 +66,6 @@
- // Include again for struct definition.
- #include "flutter/shell/common/switches.h"
- 
--// Define symbols for the ICU data that is linked into the Flutter library on
--// Android.  This is a workaround for crashes seen when doing dynamic lookups
--// of the engine's own symbols on some older versions of Android.
--#if OS_ANDROID
--extern uint8_t _binary_icudtl_dat_start[];
--extern uint8_t _binary_icudtl_dat_end[];
--
--static std::unique_ptr<fml::Mapping> GetICUStaticMapping() {
--  return std::make_unique<fml::NonOwnedMapping>(
--      _binary_icudtl_dat_start,
--      _binary_icudtl_dat_end - _binary_icudtl_dat_start);
--}
--#endif
--
- namespace flutter {
- 
- void PrintUsage(const std::string& executable_name) {
 @@ -185,9 +171,9 @@
 
    auto lookup_symbol = [&mapping, &size, symbol_prefix](
@@ -36,7 +15,7 @@
        command_line.GetOptionValue(FlagForSwitch(Switch::ICUNativeLibPath),
                                    &native_lib_path);
 
--#if OS_ANDROID
+-#if FML_OS_ANDROID
 -      settings.icu_mapper = GetICUStaticMapping;
 -#else
        settings.icu_mapper = [icu_symbol_prefix, native_lib_path] {