Merge "Fix GetDexCanonicalLocation test for relative paths."