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

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