Merge "Remove nonplat_sepolicy.cil from test"