diff --git a/device-common.mk b/device-common.mk
index 38258e5..5d62dc7 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -126,16 +126,14 @@ PRODUCT_PACKAGES += \
     android.hardware.graphics.allocator@2.0-impl \
     android.hardware.graphics.allocator@2.0-service  \
     android.hardware.graphics.composer@2.1-impl \
-    android.hardware.graphics.composer@2.1-service  \
+    android.hardware.graphics.composer@2.2-service  \
     android.hardware.graphics.mapper@2.0-impl \
     android.hardware.memtrack@1.0-impl \
     android.hardware.memtrack@1.0-service \
     android.hardware.renderscript@1.0-impl \
     gralloc.default \
-    gralloc.exynos5 \
-    hwcomposer.exynos5 \
-    memtrack.exynos5 \
     libhwc2on1adapter \
+    libhwc2onfbadapter \
     libtinyxml
 
 # DRM
diff --git a/manifest.xml b/manifest.xml
index 66b5443..6b35bdf 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,4 +1,4 @@
-<manifest version="1.0" type="device" target-level="2">
+<manifest version="1.0" type="device" target-level="3">
     <hal format="hidl">
         <name>android.hardware.audio</name>
         <transport>hwbinder</transport>
@@ -112,12 +112,12 @@
     <hal format="hidl">
         <name>android.hardware.graphics.composer</name>
         <transport>hwbinder</transport>
-        <version>2.1</version>
+        <version>2.2</version>
         <interface>
             <name>IComposer</name>
             <instance>default</instance>
         </interface>
-        <fqname>@2.1::IComposer/default</fqname>
+        <fqname>@2.2::IComposer/default</fqname>
     </hal>
     <hal format="hidl">
         <name>android.hardware.graphics.mapper</name>