am ff27e6bc: Merge "Use canonical path for /vendor/app"

* commit 'ff27e6bc44097485abfde24f396399e5eec9ff6d':
  Use canonical path for /vendor/app