Snap for 6517240 from d6bd713fc74cc3899064c64f7d78fadb364cd588 to studio-4.1-release

Change-Id: I1e99d7db206d4bf7ad3bd971543ec4faedd9d203
diff --git a/PREBUILT b/PREBUILT
index 22f58eb..979f58d 100644
--- a/PREBUILT
+++ b/PREBUILT
@@ -5,6 +5,6 @@
 The object in this prebuilt directory can be rebuilt from
         platform/frameworks/base/tools/layoutlib
 
-From: qt-layoutlib-dev@c7daa36e61368c36ed398b00cf23d8b8064a1e08
-      https://android.googlesource.com/platform/frameworks/layoutlib/+/c7daa36e61368c36ed398b00cf23d8b8064a1e08
+From: qt-layoutlib-native@296283ce89bb4d1ada9b0212ece8f349ec6a5005
+      https://android.googlesource.com/platform/frameworks/layoutlib/+/296283ce89bb4d1ada9b0212ece8f349ec6a5005
 
diff --git a/build.prop b/build.prop
index 4f04923..47e1e0f 100644
--- a/build.prop
+++ b/build.prop
@@ -1,10 +1,10 @@
-ro.system.build.date=Sun May 10 17:35:42 UTC 2020
-ro.system.build.date.utc=1589132142
-ro.system.build.fingerprint=Android/sdk_phone_armv7/generic:10/QT/6480197:userdebug/test-keys
+ro.system.build.date=Fri May 15 14:10:13 UTC 2020
+ro.system.build.date.utc=1589551813
+ro.system.build.fingerprint=Android/sdk_phone_armv7/generic:10/QT/6498563:userdebug/test-keys
 ro.system.build.id=QT
 ro.system.build.tags=test-keys
 ro.system.build.type=userdebug
-ro.system.build.version.incremental=6480197
+ro.system.build.version.incremental=6498563
 ro.system.build.version.release=10
 ro.system.build.version.sdk=29
 ro.product.system.brand=Android
@@ -13,8 +13,8 @@
 ro.product.system.model=AOSP on ARM32
 ro.product.system.name=sdk_phone_armv7
 ro.build.id=QT
-ro.build.display.id=sdk_phone_armv7-userdebug 10 QT 6480197 test-keys
-ro.build.version.incremental=6480197
+ro.build.display.id=sdk_phone_armv7-userdebug 10 QT 6498563 test-keys
+ro.build.version.incremental=6498563
 ro.build.version.sdk=29
 ro.build.version.preview_sdk=0
 ro.build.version.preview_sdk_fingerprint=REL
@@ -24,8 +24,8 @@
 ro.build.version.security_patch=2019-11-05
 ro.build.version.base_os=
 ro.build.version.min_supported_target_sdk=23
-ro.build.date=Sun May 10 17:35:42 UTC 2020
-ro.build.date.utc=1589132142
+ro.build.date=Fri May 15 14:10:13 UTC 2020
+ro.build.date.utc=1589551813
 ro.build.type=userdebug
 ro.build.tags=test-keys
 ro.build.flavor=sdk_phone_armv7-userdebug
@@ -36,7 +36,7 @@
 ro.product.cpu.abilist32=armeabi-v7a,armeabi
 ro.product.cpu.abilist64=
 ro.product.locale=en-US
-ro.build.description=sdk_phone_armv7-userdebug 10 QT 6480197 test-keys
+ro.build.description=sdk_phone_armv7-userdebug 10 QT 6498563 test-keys
 ro.config.nocheckin=yes
 ro.build.user=generic
 ro.build.host=generic
diff --git a/data/framework_res.jar b/data/framework_res.jar
index 20b244d..d0d69e7 100644
--- a/data/framework_res.jar
+++ b/data/framework_res.jar
Binary files differ
diff --git a/data/layoutlib.jar b/data/layoutlib.jar
index 6e3c8bd..936a67f 100644
--- a/data/layoutlib.jar
+++ b/data/layoutlib.jar
Binary files differ
diff --git a/data/layoutlib_native.jar b/data/layoutlib_native.jar
index a10030c..e20b32f 100644
--- a/data/layoutlib_native.jar
+++ b/data/layoutlib_native.jar
Binary files differ
diff --git a/data/mac/lib64/libandroid_runtime.dylib b/data/mac/lib64/libandroid_runtime.dylib
index 10e8d55..b5e66a7 100644
--- a/data/mac/lib64/libandroid_runtime.dylib
+++ b/data/mac/lib64/libandroid_runtime.dylib
Binary files differ
diff --git a/data/mac/lib64/libc++.dylib b/data/mac/lib64/libc++.dylib
index 470d825..c87c3f9 100644
--- a/data/mac/lib64/libc++.dylib
+++ b/data/mac/lib64/libc++.dylib
Binary files differ
diff --git a/data/mac/lib64/liblog.dylib b/data/mac/lib64/liblog.dylib
index 493dc95..98f1868 100644
--- a/data/mac/lib64/liblog.dylib
+++ b/data/mac/lib64/liblog.dylib
Binary files differ
diff --git a/data/res/version b/data/res/version
index 12b6e30..be62366 100644
--- a/data/res/version
+++ b/data/res/version
@@ -1 +1 @@
-1589207264
+1589557313
diff --git a/data/win/lib64/libandroid_runtime.dll b/data/win/lib64/libandroid_runtime.dll
index 8187b67..d3d9119 100644
--- a/data/win/lib64/libandroid_runtime.dll
+++ b/data/win/lib64/libandroid_runtime.dll
Binary files differ
diff --git a/data/win/lib64/libicuuc-host.dll b/data/win/lib64/libicuuc-host.dll
index ab5edb8..4ebcc2e 100644
--- a/data/win/lib64/libicuuc-host.dll
+++ b/data/win/lib64/libicuuc-host.dll
Binary files differ
diff --git a/data/win/lib64/libicuuc_stubdata.dll b/data/win/lib64/libicuuc_stubdata.dll
index e4fba37..5300c2e 100644
--- a/data/win/lib64/libicuuc_stubdata.dll
+++ b/data/win/lib64/libicuuc_stubdata.dll
Binary files differ
diff --git a/data/win/lib64/liblog.dll b/data/win/lib64/liblog.dll
index cecc6da..9757da1 100644
--- a/data/win/lib64/liblog.dll
+++ b/data/win/lib64/liblog.dll
Binary files differ