Merge "AndroidKeyStore: fix tests"