Merge "Fix unique ID attestation." into oc-dev
am: ead11aa0e1

Change-Id: I921dc431418e2d1e5828536e5cc95472e47bfb47
tree: 0622d3f63fcb84f7bbfb07d5f00e2a5f4d86ad94
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE