Merge changes I6873ee37,Ia18ee6e4
am: 3ccb133274

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