Fix cherries for s2ve/s2vep device

PS2: no need to split them if sister devices has the same cherries

Change-Id: I8c746ea57cbe534b4aa813072eb119eaefc493fa
Merge "Fix cherries for s2ve/s2vep device" into pac-4.4