Merge "sepolicy: renames nonplat_* to vendor_*"
am: 8abe4e2638

Change-Id: I8c568c92912348f1c90ac4477e043926ba2b384d