[RESTRICT AUTOMERGE]: Fix STS test for CVE-2017-0817

Bug: 63522430
Bug: 68653237
Test: Ran the new testcase on android-9.0.0_r1 to test with/without patch
Change-Id: Ide5c850e83e4a3d5e39bf09428922be065f2f2da
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2017-0817/Android.mk b/hostsidetests/securitybulletin/securityPatch/CVE-2017-0817/Android.mk
index cc81273..5041374 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2017-0817/Android.mk
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2017-0817/Android.mk
@@ -17,7 +17,7 @@
 
 LOCAL_MODULE := CVE-2017-0817
 LOCAL_SRC_FILES := poc.cpp
-LOCAL_SRC_FILES_arm += ../includes/omxUtils.cpp
+LOCAL_SRC_FILES_32 += ../includes/omxUtils.cpp
 LOCAL_MULTILIB := both
 LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
@@ -25,22 +25,22 @@
 LOCAL_C_INCLUDES += frameworks/av/media/libstagefright/
 LOCAL_C_INCLUDES += frameworks/native/include/media/hardware/
 LOCAL_C_INCLUDES += ../includes
-LOCAL_SHARED_LIBRARIES_arm := libstagefright
-LOCAL_SHARED_LIBRARIES_arm += libbinder
-LOCAL_SHARED_LIBRARIES_arm += libmedia
-LOCAL_SHARED_LIBRARIES_arm += libmedia_omx
-LOCAL_SHARED_LIBRARIES_arm += libmediaextractor
-LOCAL_SHARED_LIBRARIES_arm += libutils
-LOCAL_SHARED_LIBRARIES_arm += liblog
-LOCAL_SHARED_LIBRARIES_arm += libui
-LOCAL_SHARED_LIBRARIES_arm += libstagefright_foundation
-LOCAL_SHARED_LIBRARIES_arm += libcutils
-LOCAL_SHARED_LIBRARIES_arm += libhidlbase
-LOCAL_SHARED_LIBRARIES_arm += libhidlmemory
-LOCAL_SHARED_LIBRARIES_arm += libnativewindow
-LOCAL_SHARED_LIBRARIES_arm += android.hidl.allocator@1.0
-LOCAL_SHARED_LIBRARIES_arm += android.hidl.memory@1.0
-LOCAL_SHARED_LIBRARIES_arm += android.hardware.media.omx@1.0
+LOCAL_SHARED_LIBRARIES_32 := libstagefright
+LOCAL_SHARED_LIBRARIES_32 += libbinder
+LOCAL_SHARED_LIBRARIES_32 += libmedia
+LOCAL_SHARED_LIBRARIES_32 += libmedia_omx
+LOCAL_SHARED_LIBRARIES_32 += libmediaextractor
+LOCAL_SHARED_LIBRARIES_32 += libutils
+LOCAL_SHARED_LIBRARIES_32 += liblog
+LOCAL_SHARED_LIBRARIES_32 += libui
+LOCAL_SHARED_LIBRARIES_32 += libstagefright_foundation
+LOCAL_SHARED_LIBRARIES_32 += libcutils
+LOCAL_SHARED_LIBRARIES_32 += libhidlbase
+LOCAL_SHARED_LIBRARIES_32 += libhidlmemory
+LOCAL_SHARED_LIBRARIES_32 += libnativewindow
+LOCAL_SHARED_LIBRARIES_32 += android.hidl.allocator@1.0
+LOCAL_SHARED_LIBRARIES_32 += android.hidl.memory@1.0
+LOCAL_SHARED_LIBRARIES_32 += android.hardware.media.omx@1.0
 
 # Tag this module as a cts test artifact
 LOCAL_COMPATIBILITY_SUITE := cts sts vts