Merge "Use canonical path for /vendor/app"