Merge "NativeCrypto: catch null input streams in cert factory"