am 26be6a17: am aae1bbf4: Merge "bundle init.rc contents with its service"

* commit '26be6a17cdfaa94dcb33a04af085aedfa527e833':
  bundle init.rc contents with its service
tree: 1db6e22155e384ecf11081dff740ba25c55c62f3
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/