Merge "bundle init.rc contents with its service"
tree: f35985321e99f6e604aebf1e6950a0867848908c
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/