Merge "Use canonical paths when searching for dex files"