am 6029dfa8: am 7caa8f14: Merge "Make \'idmap --scan\' accept more than one input directory"

* commit '6029dfa81a01ab41318a8e9601448387179f8703':
  Make 'idmap --scan' accept more than one input directory