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

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

 #!/usr/bin/env python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 """Remove the build metadata embedded in the artifacts of a build."""
 
 import json
 import multiprocessing
 import optparse
 import os
@@ skipping 22 matching lines @@
     if not os.path.isfile(f) or os.path.basename(f).startswith('.'):
       return False
     if os.path.getmtime(os.path.join(build_dir, f)) < min_timestamp:
       return False
     ext = os.path.splitext(f)[1]
     return (ext in non_x_ok_exts) or (ext in allowed and os.access(f, os.X_OK))
 
   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') or d == 'apks']
+      dirs[:] = [d for d in dirs if d.endswith('_apk')]
     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
 
 
 def run_zap_timestamp(src_dir, filepath):
   """Run zap_timestamp.exe on a PE binary."""
   assert sys.platform == 'win32'
   syzygy_dir = os.path.join(
       src_dir, 'third_party', 'syzygy', 'binaries', 'exe')
@@ skipping 96 matching lines @@
     parser.error('--build-dir is required')
 
   if sys.platform == 'win32' and not options.src_dir:
     parser.error('--src-dir is required')
 
   return remove_metadata(options.build_dir, options.src_dir, options.recursive)
 
 
 if __name__ == '__main__':
   sys.exit(main())