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

Change-Id: If2c89f279bb50b9e703974de886622b13d13357c
tree: 9b15666df42bba7b0e71dbed0157cae1288fca2f
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE