Revert "Convert LOCAL_LOCAL_JNI_SHARED_LIBRARIES to LOCAL_REQUIRED_MODULES in a full build"

This reverts commit 81f0fd6cdbf42d1034bf9e9f36991a131eca3f4f

The change broke the CTS build:
CTS does need the jni library embedded in the apk.
diff --git a/core/package.mk b/core/package.mk
index 45f1fcf..c689031 100644
--- a/core/package.mk
+++ b/core/package.mk
@@ -87,15 +87,6 @@
 LOCAL_AAPT_FLAGS := $(LOCAL_AAPT_FLAGS) -z
 endif
 
-# Convert LOCAL_JNI_SHARED_LIBRARIES to LOCAL_REQUIRED_MODULES in full build,
-# for preloaded apks don't like embedded jni libraries.
-ifndef TARGET_BUILD_APPS
-ifdef LOCAL_JNI_SHARED_LIBRARIES
-LOCAL_REQUIRED_MODULES += $(LOCAL_JNI_SHARED_LIBRARIES)
-LOCAL_JNI_SHARED_LIBRARIES :=
-endif
-endif
-
 ifeq (,$(LOCAL_ASSET_DIR))
 LOCAL_ASSET_DIR := $(LOCAL_PATH)/assets
 endif