am 350fbb78: am 099a9d06: Merge commit \'7d563651aa956c0f9831b7b64be35c2ec790bdec\' into HEAD

* commit '350fbb7868a7f3ddc1fc84ff79f0793b8b530cd8':
tree: b20925ec37614fa4616afaaaa0acd0e86b91c834
  1. Android.mk
  2. keymaster_qcom.cpp
  3. keymaster_qcom.h
  4. QSEEComAPI.h