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

Change-Id: Ib3feef2a0c7db446208be74620116562ba1f8121