Merge changes I1a855726,Ib7976671,I76e5ee5a into main

* changes:
  keystore: remove misleading error message from AES_gcm_decrypt()
  keystore: eliminate redundant key stretching
  keystore: rename the PBKDF2 functions