Merge "Leftovers of the SELinux policy update mechanism" am: b9c0788806
am: 0af61f0024

* commit '0af61f0024d137e7a2f1ac0d9e002711cd01092c':
  Leftovers of the SELinux policy update mechanism