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

* commit 'aae1bbf440bf9b1508ed251165fa45f1305721ef':
  bundle init.rc contents with its service
tree: 42b785ad8ae5f118a290951beb3963f5e45db6d4
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/