Merge "Fix unique ID attestation." into oc-dev
tree: 0622d3f63fcb84f7bbfb07d5f00e2a5f4d86ad94
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE