am eed96af1: am 9b4f1ff2: init.rc: specify keystore directory and fix permissions.

Merge commit 'eed96af19d81803d982c8cb91e2a120c8035e980'

* commit 'eed96af19d81803d982c8cb91e2a120c8035e980':
  init.rc: specify keystore directory and fix permissions.