am 0cf5fd37: Merge "NativeCrypto: throw instead of return null"

* commit '0cf5fd372b66b88c3636df3f4469c592529bec12':
  NativeCrypto: throw instead of return null