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

* commit '060bd97e948fb35b5dd85f734159c37d882af955':
tree: 968bc96593217c67fc6b9ebad42058a024484edb
  1. Android.mk
  2. keymaster_qcom.cpp
  3. keymaster_qcom.h
  4. QSEEComAPI.h