Reduce overhead by combining libskia and libhwui into a single library.

This is a multiproject change as we need to both the libraries
themselves as well as those that had dependencies on libskia.so

Bug: 31971097
Test: compile only
Change-Id: I27810dd32194c30b80b49c4eae967613aa3fb2cb
diff --git a/services/surfaceflinger/tests/hwc2/Android.mk b/services/surfaceflinger/tests/hwc2/Android.mk
index 6d20349..010ac9c 100644
--- a/services/surfaceflinger/tests/hwc2/Android.mk
+++ b/services/surfaceflinger/tests/hwc2/Android.mk
@@ -37,7 +37,7 @@
     libgui \
     liblog \
     libsync \
-    libskia \
+    libhwui \
     android.hardware.graphics.common@1.0
 LOCAL_STATIC_LIBRARIES := \
     libbase \