am c690332c: Merge "Revert "init re-execs to set its security context now.""

* commit 'c690332c5e4008d0f58d7a356311a821ef07d0cf':
  Revert "init re-execs to set its security context now."