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

* commit '04870d07fabf7df356b805b6d6420665ed2dec37':
  NativeCrypto: throw instead of return null