Merge tag 'android-6.0.1_r22' into HEAD

Android 6.0.1 release 22
tree: a275f1f3321e0d1d023d9c7a0134b05e1a9b57ac
  1. Android.mk
  2. keymaster_qcom.cpp
  3. keymaster_qcom.h
  4. QSEEComAPI.h