Merge "Track the move of split SELinux policy CIL files"