am e35dafa8: Merge "Use canonical UniquePtr.h header"

* commit 'e35dafa88f1ba15a30b95556755ab17c7207be9d':
  Use canonical UniquePtr.h header
tree: 6124a225bfaee2976eb3dd9af9ebb00a7a152724
  1. Android.mk
  2. keymaster_qcom.cpp
  3. keymaster_qcom.h
  4. QSEEComAPI.h