am e2d5b777: am e65c2969: Merge "Add utility function find-files-in-subdirs"

* commit 'e2d5b7772b0d4de8220f08e35430ea1bba3a9fcc':
  Add utility function find-files-in-subdirs