Search in apks/ as well as *_apk/ for built apks.

scripts/slave/recipe_modules/isolate/resources/remove_build_metadata.py

Index: scripts/slave/recipe_modules/isolate/resources/remove_build_metadata.py
diff --git a/scripts/slave/recipe_modules/isolate/resources/remove_build_metadata.py b/scripts/slave/recipe_modules/isolate/resources/remove_build_metadata.py
index 287ee9b96adf768a0ab66fbb39d9368ac8fbcd78..511054160a37254e0ec9849735e8ac326a7b6c1b 100755
--- a/scripts/slave/recipe_modules/isolate/resources/remove_build_metadata.py
+++ b/scripts/slave/recipe_modules/isolate/resources/remove_build_metadata.py
@@ -40,7 +40,8 @@ def get_files_to_clean(build_dir, recursive=False):
   ret_files = set()
   for root, dirs, files in os.walk(build_dir):
     if not recursive:
-      dirs[:] = [d for d in dirs if d.endswith('_apk')]
+      dirs[:] = [d for d in dirs
+                 if d.endswith('_apk') or d == 'apks']
     for f in (f for f in files if check(os.path.join(root, f))):
       ret_files.add(os.path.relpath(os.path.join(root, f), build_dir))
   return ret_files