am 3c1a3200: am 32155e0a: Merge "Use canonical paths when searching for dex files"

* commit '3c1a32000553b919803c8c125fcd5533d2cf99ae':
  Use canonical paths when searching for dex files