KeyStore API and implementation enhancements to better integrate with
Android.