Merge Android 12

Bug: 202323961
Merged-In: I93bf9e6af8b5974f314a4da28410f98bccfced2d
Change-Id: I72c8fdc180a6fe6af70f5c93c0fd67e6f80fe27e
diff --git a/uml.mk b/uml.mk
index 7f15f07..369e0fe 100644
--- a/uml.mk
+++ b/uml.mk
@@ -68,7 +68,6 @@
     libm \
     libpower \
     libstdc++ \
-    libsurfaceflinger \
     libsysutils \
     libui \
     libutils \