Merge "Fix GetDexCanonicalLocation test for relative paths." into lmp-dev