Merge "Track the move of split SELinux policy CIL files"
am: 8df4dded13

Change-Id: I4c6f911ab9aa6062370e90d15f82a470cdcf8147