Merge tag 'android-6.0.1_r24' of https://android.googlesource.com/platform/hardware/qcom/keymaster into HEAD

Android 6.0.1 release 24

Change-Id: I349c108b87c816e8bfe5eb86fd4372614facad8a
tree: 5bdd63ae4c4391993ca38ead36d4503fdbb2b9b4
  1. Android.mk
  2. keymaster_qcom.cpp
  3. keymaster_qcom.h
  4. QSEEComAPI.h