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

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