Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':
  Wrap incomplete keymaster1 implementations with sw keymaster.

Conflicts:
	keystore/keystore.cpp

Change-Id: Ib630bf22dc50de7b15f7a0729bc926eddc9523ce
tree: dcf0f65504b4c3af275202bc49938893438b2ffb
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/