Merge 7761fcdbe8889092c1bbf900970d0ac6b5640a8d on remote branch

Change-Id: I7d11043cfdc32cbe0f1945ff494dfa6ff06fa7b7
diff --git a/atest/atest_utils.py b/atest/atest_utils.py
index ae6b77c..4749063 100644
--- a/atest/atest_utils.py
+++ b/atest/atest_utils.py
@@ -328,8 +328,8 @@
     static_targets = [
         'dist',
         'apps_only',
-        'out/soong/host/linux-x86/bin/merge_zips',
-        'out/soong/host/linux-x86/bin/aapt2'
+        'merge_zips',
+        'aapt2'
     ]
     cmd = get_build_cmd()
     cmd.append(target_build_apps)