Merge "sepolicy: core-ctl related changes"