am a8ccfe8f: am 1c779207: Merge "NativeCrypto: switch throw mappings to switch"

* commit 'a8ccfe8f3766da6a7f82b0ca7c147f06a9bc50c5':
  NativeCrypto: switch throw mappings to switch