Merge \\"Fix google-explicit-constructor warnings in keystore.\\" am: 590a1dade7
am: d62c7277dc

Change-Id: I7658c6aaa0bc9ac8ebb31bf30697a54b1738bacb
tree: 970f7382960c384acca1172ffd342bc46099cf00
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE