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

Change-Id: Ic04767bd6ad22abe98556f0da17c7d820f9ae61c