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

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