Snap for 7215602 from 7552c5c44150342568c145f241eaee49ba5732dc to studio-4.2-release

Change-Id: I3f4a0fed4fdbb16a1db6a0c83d94967e4803bf7e
diff --git a/common/aapt/README.md b/common/aapt/README.md
index 2f5a5fc..dc9b033 100644
--- a/common/aapt/README.md
+++ b/common/aapt/README.md
@@ -3,7 +3,7 @@
 All the files in this directory are generated by the update_aapt2_prebuilt tool.
 Do not edit manually.
 
-Build ID: 6840111
+Build ID: 7147631
 
 The Build ID is combined with the build version to give a version that is both
 unique per gradle plugin version and encodes where the prebuilt of AAPT2 came
diff --git a/common/aapt/aapt2_version.properties b/common/aapt/aapt2_version.properties
index 712a2df..c2cbc12 100644
--- a/common/aapt/aapt2_version.properties
+++ b/common/aapt/aapt2_version.properties
@@ -1,3 +1,3 @@
 #### Generated file, do not edit manually ####
 #AAPT2 version definiton. See README.md
-aapt2Version=6840111
+aapt2Version=7147631
diff --git a/common/aapt/darwin/aapt2 b/common/aapt/darwin/aapt2
index b243226..8211115 100755
--- a/common/aapt/darwin/aapt2
+++ b/common/aapt/darwin/aapt2
Binary files differ
diff --git a/common/aapt/linux/aapt2 b/common/aapt/linux/aapt2
index a4e3b71..6b07408 100755
--- a/common/aapt/linux/aapt2
+++ b/common/aapt/linux/aapt2
Binary files differ
diff --git a/common/aapt/windows/aapt2.exe b/common/aapt/windows/aapt2.exe
index d4f66d8..e9be9f0 100755
--- a/common/aapt/windows/aapt2.exe
+++ b/common/aapt/windows/aapt2.exe
Binary files differ