Merge "sepolicy: renames nonplat_* to vendor_*"