Merge "AndroidKeyStore and AndroidKeyPairGenerator tests" into jb-mr2-dev