diff --git a/universal7885-common/CleanSpec.mk b/universal7885-common/CleanSpec.mk
index f8e5116..e7f5ed2 100644
--- a/universal7885-common/CleanSpec.mk
+++ b/universal7885-common/CleanSpec.mk
@@ -46,3 +46,5 @@
 
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/*)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/*)
+
+
diff --git a/universal7885-common/configs/vintf/manifest.xml b/universal7885-common/configs/vintf/manifest.xml
index bd588a2..590266b 100644
--- a/universal7885-common/configs/vintf/manifest.xml
+++ b/universal7885-common/configs/vintf/manifest.xml
@@ -100,7 +100,7 @@
     <hal format="hidl">
         <name>android.hardware.graphics.mapper</name>
         <transport arch="32+64">passthrough</transport>
-        <version>2.1</version>
+        <version>2.0</version>
         <interface>
             <name>IMapper</name>
             <instance>default</instance>
diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk
index f21ebf6..f09b6e2 100644
--- a/universal7885-common/universal7885-common.mk
+++ b/universal7885-common/universal7885-common.mk
@@ -88,8 +88,9 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     android.hardware.graphics.allocator@2.0-impl \
     android.hardware.graphics.allocator@2.0-service \
-    android.hardware.graphics.composer@2.4-service \
-    android.hardware.graphics.mapper@2.0-impl-2.1 \
+    android.hardware.graphics.composer@2.1-impl \
+    android.hardware.graphics.composer@2.1-service \
+    android.hardware.graphics.mapper@2.0-impl \
     libgui_vendor
 
 # GcamGO