Merge "Move split sepolicy to correct locations"