Revert "Snap for 5187456 from 32733ec864dc85c4e965cde1df3459b554052647 to qt-release"

This partially reverts commit a3f9e78e5697381e04665143e03c1d1092239940.

Reason for revert: Breaks loading of libRS_internal.so.

Change-Id: Ife4b53a3fb1d33705642d06dd77303e1b408a100
(cherry picked from commit 5dc60c9690391305d94f2f7a6b875c8dda72d2e9)
diff --git a/tests/tests/simpleperf/Android.mk b/tests/tests/simpleperf/Android.mk
index 24152c6..94c2a17 100644
--- a/tests/tests/simpleperf/Android.mk
+++ b/tests/tests/simpleperf/Android.mk
@@ -18,8 +18,6 @@
 LOCAL_STATIC_LIBRARIES += \
   libbacktrace \
   libunwindstack \
-  libdexfile_support \
-  libdexfile_external \
   libdexfile \
   libziparchive \
   libz \