am 7e0d3066: am fc729512: Merge "Set SELinux security contexts correctly for init and services."

* commit '7e0d30667cf53a182525f87dd0c8cb0e2628a1ed':
  Set SELinux security contexts correctly for init and services.