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

Change-Id: Idb9364f221776c789f358c51988ad0cdc358eabe