DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: I762f68dd64ffa3df45215e60700d05e58dc33e9f
tree: c70089451e810f18fa390fb86dd5672f971c7a8e
  1. Android.mk
  2. keymaster_qcom.cpp
  3. keymaster_qcom.h
  4. QSEEComAPI.h