Follow the established pattern for the vendor/ entry points.

That way, scripts that expect that pattern don't get confused.

Bug: 6931494
Change-Id: I121e013af42fa8ee64f56dcacc81e17a945e01af
4 files changed