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

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