am 92362636: (-s ours) import_openssl.sh improvements based on external/bouncycastle work

Merge commit '9236263621bae68ac3e819dba9a0743e700c107f' into dalvik-dev

* commit '9236263621bae68ac3e819dba9a0743e700c107f':
  import_openssl.sh improvements based on external/bouncycastle work