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

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