diff --git a/Android.mk b/Android.mk
index 5605fdb..d3823c3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -45,10 +45,14 @@
 
 LOCAL_SDK_VERSION := current
 LOCAL_PACKAGE_NAME := Launcher3
+LOCAL_PRIVILEGED_MODULE := true
+#LOCAL_CERTIFICATE := shared
+
 LOCAL_OVERRIDES_PACKAGES := Home Launcher2
 
 include $(BUILD_PACKAGE)
 
+
 #
 # Launcher proto buffer jar used for development
 #
@@ -66,5 +70,4 @@
 
 include $(BUILD_HOST_JAVA_LIBRARY)
 
-# ==================================================
 include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proguard.flags b/proguard.flags
index a167663..15faed9 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -1,7 +1,3 @@
--keep,allowshrinking,allowoptimization class com.android.launcher3.** {
-  *;
-}
-
 -keep class com.android.launcher3.allapps.AllAppsBackgroundDrawable {
   public void setAlpha(int);
   public int getAlpha();
diff --git a/src/com/android/launcher3/LauncherBackupHelper.java b/src/com/android/launcher3/LauncherBackupHelper.java
index cad0f2c..ea67ac8 100644
--- a/src/com/android/launcher3/LauncherBackupHelper.java
+++ b/src/com/android/launcher3/LauncherBackupHelper.java
@@ -1102,12 +1102,6 @@
             }
         } catch (IOException e) {
             Log.w(TAG, "failed to close the journal", e);
-        } finally {
-            try {
-                inStream.close();
-            } catch (IOException e) {
-                Log.w(TAG, "failed to close the journal", e);
-            }
         }
         return journal;
     }
@@ -1140,7 +1134,6 @@
             FileOutputStream outStream = new FileOutputStream(newState.getFileDescriptor());
             final byte[] journalBytes = writeCheckedBytes(journal);
             outStream.write(journalBytes);
-            outStream.close();
             if (VERBOSE) Log.v(TAG, "wrote " + journalBytes.length + " bytes of journal");
         } catch (IOException e) {
             Log.w(TAG, "failed to write backup journal", e);