am 4ad4b860: am 704fe6bc: Make sure file paths are canonical in scanFile()

* commit '4ad4b8603cc0af86424e3224f683a35c96f88d21':
  Make sure file paths are canonical in scanFile()