Merge "Remove redundant vendor sepolicy files"