Merge changes I6873ee37,Ia18ee6e4 am: 3ccb133274 am: 204e5eed73
am: 3aa6a436de

Change-Id: I4e085b18f20446616944f34de84ac1d4feadc00a
tree: edfa6130c18cb06e4f5730f8305b1aa3f09ebd5a
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE