Merge RP1A.200326.001

Change-Id: I93e705a55b508a386db8882a5fa80aa3c0b7856f
diff --git a/linux-x86_64/emulator b/linux-x86_64/emulator
index b003dea..db56340 100755
--- a/linux-x86_64/emulator
+++ b/linux-x86_64/emulator
Binary files differ
diff --git a/linux-x86_64/lib/advancedFeatures.ini b/linux-x86_64/lib/advancedFeatures.ini
index 6765b48..96e33f0 100644
--- a/linux-x86_64/lib/advancedFeatures.ini
+++ b/linux-x86_64/lib/advancedFeatures.ini
@@ -300,3 +300,7 @@
 # Do not create mac80211_hwsim radios by the kernel on boot, create radios from
 # userspace instead.
 Mac80211hwsimUserspaceManaged = on
+
+# HasSharedSlotsHostMemoryAllocator---------------------------------------------
+# Host supports AddressSpaceSharedSlotsHostMemoryAllocatorContext
+HasSharedSlotsHostMemoryAllocator = on
diff --git a/linux-x86_64/lib/advancedFeaturesCanary.ini b/linux-x86_64/lib/advancedFeaturesCanary.ini
index bc8e7cc..2ca7c84 100644
--- a/linux-x86_64/lib/advancedFeaturesCanary.ini
+++ b/linux-x86_64/lib/advancedFeaturesCanary.ini
@@ -305,3 +305,7 @@
 # Do not create mac80211_hwsim radios by the kernel on boot, create radios from
 # userspace instead.
 Mac80211hwsimUserspaceManaged = on
+
+# HasSharedSlotsHostMemoryAllocator---------------------------------------------
+# Host supports AddressSpaceSharedSlotsHostMemoryAllocatorContext
+HasSharedSlotsHostMemoryAllocator = on
diff --git a/linux-x86_64/lib64/emulator-studio-view.jar b/linux-x86_64/lib64/emulator-studio-view.jar
index d378616..ade0fdf 100644
--- a/linux-x86_64/lib64/emulator-studio-view.jar
+++ b/linux-x86_64/lib64/emulator-studio-view.jar
Binary files differ
diff --git a/linux-x86_64/lib64/libGLES_V2_translator.so b/linux-x86_64/lib64/libGLES_V2_translator.so
index ea8735f..5c5e073 100644
--- a/linux-x86_64/lib64/libGLES_V2_translator.so
+++ b/linux-x86_64/lib64/libGLES_V2_translator.so
Binary files differ
diff --git a/linux-x86_64/lib64/libOpenglRender.so b/linux-x86_64/lib64/libOpenglRender.so
index f13fbea..cfc55de 100644
--- a/linux-x86_64/lib64/libOpenglRender.so
+++ b/linux-x86_64/lib64/libOpenglRender.so
Binary files differ
diff --git a/linux-x86_64/lib64/libemugl_common.so b/linux-x86_64/lib64/libemugl_common.so
index bdee9c3..b307736 100644
--- a/linux-x86_64/lib64/libemugl_common.so
+++ b/linux-x86_64/lib64/libemugl_common.so
Binary files differ
diff --git a/linux-x86_64/qemu-img b/linux-x86_64/qemu-img
index 231781a..e41abf0 100755
--- a/linux-x86_64/qemu-img
+++ b/linux-x86_64/qemu-img
Binary files differ
diff --git a/linux-x86_64/qemu/linux-x86_64/qemu-system-aarch64 b/linux-x86_64/qemu/linux-x86_64/qemu-system-aarch64
index bb541a2..3953b19 100755
--- a/linux-x86_64/qemu/linux-x86_64/qemu-system-aarch64
+++ b/linux-x86_64/qemu/linux-x86_64/qemu-system-aarch64
Binary files differ
diff --git a/linux-x86_64/qemu/linux-x86_64/qemu-system-aarch64-headless b/linux-x86_64/qemu/linux-x86_64/qemu-system-aarch64-headless
index eaec4b2..f32abc8 100755
--- a/linux-x86_64/qemu/linux-x86_64/qemu-system-aarch64-headless
+++ b/linux-x86_64/qemu/linux-x86_64/qemu-system-aarch64-headless
Binary files differ
diff --git a/linux-x86_64/qemu/linux-x86_64/qemu-system-armel b/linux-x86_64/qemu/linux-x86_64/qemu-system-armel
index c80d595..2144e74 100755
--- a/linux-x86_64/qemu/linux-x86_64/qemu-system-armel
+++ b/linux-x86_64/qemu/linux-x86_64/qemu-system-armel
Binary files differ
diff --git a/linux-x86_64/qemu/linux-x86_64/qemu-system-armel-headless b/linux-x86_64/qemu/linux-x86_64/qemu-system-armel-headless
index cb2e199..a6e24ab 100755
--- a/linux-x86_64/qemu/linux-x86_64/qemu-system-armel-headless
+++ b/linux-x86_64/qemu/linux-x86_64/qemu-system-armel-headless
Binary files differ
diff --git a/linux-x86_64/qemu/linux-x86_64/qemu-system-i386 b/linux-x86_64/qemu/linux-x86_64/qemu-system-i386
index 3c9a789..d20ec1b 100755
--- a/linux-x86_64/qemu/linux-x86_64/qemu-system-i386
+++ b/linux-x86_64/qemu/linux-x86_64/qemu-system-i386
Binary files differ
diff --git a/linux-x86_64/qemu/linux-x86_64/qemu-system-i386-headless b/linux-x86_64/qemu/linux-x86_64/qemu-system-i386-headless
index 93eb3a1..e48fd97 100755
--- a/linux-x86_64/qemu/linux-x86_64/qemu-system-i386-headless
+++ b/linux-x86_64/qemu/linux-x86_64/qemu-system-i386-headless
Binary files differ
diff --git a/linux-x86_64/qemu/linux-x86_64/qemu-system-x86_64 b/linux-x86_64/qemu/linux-x86_64/qemu-system-x86_64
index 1237483..fb329f1 100755
--- a/linux-x86_64/qemu/linux-x86_64/qemu-system-x86_64
+++ b/linux-x86_64/qemu/linux-x86_64/qemu-system-x86_64
Binary files differ
diff --git a/linux-x86_64/qemu/linux-x86_64/qemu-system-x86_64-headless b/linux-x86_64/qemu/linux-x86_64/qemu-system-x86_64-headless
index 52e8d63..ec620eb 100755
--- a/linux-x86_64/qemu/linux-x86_64/qemu-system-x86_64-headless
+++ b/linux-x86_64/qemu/linux-x86_64/qemu-system-x86_64-headless
Binary files differ
diff --git a/linux-x86_64/source.properties b/linux-x86_64/source.properties
index ae96e22..fa33bba 100644
--- a/linux-x86_64/source.properties
+++ b/linux-x86_64/source.properties
@@ -1,5 +1,5 @@
 Pkg.UserSrc=false
-Pkg.Revision=30.0.5
+Pkg.Revision=30.0.6
 Pkg.Path=emulator
 Pkg.Desc=Android Emulator
-Pkg.BuildId=6295583
\ No newline at end of file
+Pkg.BuildId=6317390
\ No newline at end of file