Snap for 5240105 from fa1db3e39e1b3b66a93b0c166df2391d80a26ca7 to qt-release

Change-Id: I07bfdf52256509a9cb7c05b1ed8558014dd1cf31
diff --git a/Android.bp b/Android.bp
index 9b2581b..93ce028 100644
--- a/Android.bp
+++ b/Android.bp
@@ -105,18 +105,22 @@
     target: {
         android: {
             shared_libs: [
+                "libcutils",
                 "libutils",
             ],
         },
         host: {
             static_libs: [
+                "libcutils",
                 "libutils",
             ],
         },
+        windows: {
+            enabled: true,
+        },
     },
 
     shared_libs: [
-        "libcutils",
         "libandroidicu",
         "liblog",
     ],