Android CTS 11.0 Release 7 (8072971)
[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: a0cac96b99 -s ours
am skip reason: subject contains skip directive

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