Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
diff --git a/hwc/Android.mk b/hwc/Android.mk
index c6a2eae..b02cfe9 100644
--- a/hwc/Android.mk
+++ b/hwc/Android.mk
@@ -4,7 +4,6 @@
 # HAL module implementation, not prelinked and stored in
 # hw/<HWCOMPOSE_HARDWARE_MODULE_ID>.<ro.product.board>.so
 include $(CLEAR_VARS)
-LOCAL_PRELINK_MODULE := false
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/../vendor/lib/hw
 LOCAL_SHARED_LIBRARIES := liblog libEGL libcutils libutils libhardware libhardware_legacy libz
diff --git a/libtiutils/Android.mk b/libtiutils/Android.mk
index 2540985..cd4cbcb 100644
--- a/libtiutils/Android.mk
+++ b/libtiutils/Android.mk
@@ -4,7 +4,6 @@
 
 include $(CLEAR_VARS)
 
-LOCAL_PRELINK_MODULE := false
 
 LOCAL_SRC_FILES:= \
     MessageQueue.cpp \
diff --git a/security/smc_pa_ctrl/Android.mk b/security/smc_pa_ctrl/Android.mk
index fe0bdf4..0203cad 100644
--- a/security/smc_pa_ctrl/Android.mk
+++ b/security/smc_pa_ctrl/Android.mk
@@ -3,7 +3,6 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_PRELINK_MODULE := false
 LOCAL_ARM_MODE := arm
 
 LOCAL_SRC_FILES:= \
diff --git a/security/tee_client_api/Android.mk b/security/tee_client_api/Android.mk
index bfd92f4..30279a6 100644
--- a/security/tee_client_api/Android.mk
+++ b/security/tee_client_api/Android.mk
@@ -3,7 +3,6 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_PRELINK_MODULE := false
 LOCAL_ARM_MODE := arm
 
 LOCAL_SRC_FILES:= \
diff --git a/security/tf_crypto_sst/Android.mk b/security/tf_crypto_sst/Android.mk
index 6d3a9d8..201a658 100644
--- a/security/tf_crypto_sst/Android.mk
+++ b/security/tf_crypto_sst/Android.mk
@@ -3,7 +3,6 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_PRELINK_MODULE := false
 LOCAL_ARM_MODE := arm
 
 LOCAL_SRC_FILES := \
diff --git a/security/tf_daemon/Android.mk b/security/tf_daemon/Android.mk
index eccba3d..50a51e1 100644
--- a/security/tf_daemon/Android.mk
+++ b/security/tf_daemon/Android.mk
@@ -3,7 +3,6 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_PRELINK_MODULE := false
 LOCAL_ARM_MODE := arm
 
 LOCAL_SRC_FILES := \