Merge "Use split SELinux policy at boot, if available" am: 056eca201b
am: a3ccbe6abc

Change-Id: If5325bc1a9de07becf72eed295116889323055c2