am 162723c0: am 060bd97e: Merge commit \'eab8a2ac417ba93bdfb09ddcb6095580a0cef0c4\' into HEAD

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