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

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