Android CTS 7.0 Release 21 (4723847)
merge in nyc-release history after reset to nyc-dev
tree: daf9dd3ae2acf43cc8d87e48c41c41ab76b6a6bd
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE