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

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