Snap for 5386257 from 570d57488d3e0dd5652b8482d63a1fdbe77d37cd to qt-release

Change-Id: I345b4be9772a5b86efb4b7226fcb5c78002cabad
diff --git a/Android.bp b/Android.bp
index 4191d92..b8be740 100644
--- a/Android.bp
+++ b/Android.bp
@@ -404,7 +404,7 @@
             shared_libs: ["liblzma"],
         },
         windows: {
-            static_libs: ["libunwindbacktrace", "libunwind_static"],
+            enabled: true,
             // Only build enable_execute_stack.c on non-Windows hosts.
             exclude_srcs: ["lib/builtins/enable_execute_stack.c"],
         },