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

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