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

Change-Id: Ia99fdbbdb4f5a17e048afcf3ded1815802702118