VENDOR PAC Replace s2ve/s2vep adds/removes with patches

Change-Id: Ic15a1ff1d5a2cccfaef49e44df0af5b81c51fbbf