Merge "Reduce chance of zero-length keystore files"
am: 71251eec8d

Change-Id: I770e609b45515799020c352aa9ed4999e7989ddd
tree: e35f87effc80b3077753d5dbecd7243b4ee2f23c
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE