Revert^2 "Merging from ub-launcher3-master @ build 6294827"

61cbcf3176c7aff4728d09050a5344031afb238d
Bug: 151611270
Change-Id: Ifb26e52b91760395925ed9496664016f006c1f66
diff --git a/Android.mk b/Android.mk
index c5be43b..987c875 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,7 +26,7 @@
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_STATIC_ANDROID_LIBRARIES := WallpaperPicker2CommonDepsLib
-LOCAL_STATIC_JAVA_LIBRARIES := styleprotosnano SystemUI-statsd
+LOCAL_STATIC_JAVA_LIBRARIES := styleprotosnano SystemUI-statsd SystemUISharedLib
 LOCAL_PROGUARD_ENABLED := disabled
 
 LOCAL_PACKAGE_NAME := ThemePicker