Merge "Revert "Renames nonplat_* to vendor_*""