Merge "Test AndroidKeyPairGenerator keys in SSL" into klp-dev