Merge "Add more digests to AndroidKeyStore API."