Merge "first stage mount: support mount points like /vendor/abc"