Merge tag 'android-7.1.0_r4' of https://android.googlesource.com/platform/hardware/qcom/keymaster into 71

Android 7.1.0 release 4
tree: b85960235360badb9022f8b202f16e25bd1ac472
  1. Android.mk
  2. keymaster_qcom.cpp
  3. keymaster_qcom.h
  4. QSEEComAPI.h