am 9bc8c62e: am 357df19b: Merge "Exclude subdirectories when pruning the dex cache."

* commit '9bc8c62ea4d86d948af7a2aade8b0b5502a84b6a':
  Exclude subdirectories when pruning the dex cache.