Merge change 6814

* changes:
  Change 107 and 146 from partner repo.
diff --git a/libs/surfaceflinger/Android.mk b/libs/surfaceflinger/Android.mk
index dca368c..93cb5ae 100644
--- a/libs/surfaceflinger/Android.mk
+++ b/libs/surfaceflinger/Android.mk
@@ -37,7 +37,7 @@
 	libpixelflinger \
 	libhardware \
 	libutils \
-	libcorecg \
+	libskia \
 	libEGL \
 	libGLESv1_CM \
 	libbinder \