Merge "Fix a mismatched malloc/delete" am: 619ac6c26b am: 05033f69eb am: 8616719671
am: 6a7d20c257

Change-Id: I97995297559feefed6a7cff79588d17c58d1efa5
tree: 7364595fb063a76429a4cf3c96053f86202c3b7c
  1. Android.mk
  2. keymaster_qcom.cpp
  3. keymaster_qcom.h
  4. QSEEComAPI.h