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

Change-Id: Ib56a7c0f50babf6eaa70bea083610ff484d784d9