Merge "Temporarily disable FakeOemFeatures from userdebug or higher builds" into jb-dev

Author: Justin Ho

packages/FakeOemFeatures/Android.mk

@@ -1,7 +1,7 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_MODULE_TAGS := debug
+LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)