am 35dadbc8: am 9f64567d: Merge changes Icb667451,Ie08d910b

* commit '35dadbc8d83dff4fd5c3fb90cc4bf1c5f37b865c':
  Use template instead of macro to release UniquePtrs.
  Make usage of new/delete and malloc/free consistent.
tree: 716182964c16e93cf96cfa3d592f5b18306ee812
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/