am 11db17c4: Merge "Fix GetDexCanonicalLocation test for relative paths." into lmp-dev

* commit '11db17c44cdbd71e97a677cdc8fb1e18907ab93d':
  Fix GetDexCanonicalLocation test for relative paths.