am 4b704541: (-s ours) am c7b3ba5e: am a5e1ef4e: am 9576bbd3: (-s ours) am 810a7295: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '4b704541281db226deda9a45ea7e9de3ab247c86':
am 8c18c33a: resolved conflicts for merge of aebc7ff8 to jb-mr2-dev

* commit '8c18c33a4188b609bc9a9b22d0997a9613cf81d1':
  Make ECDH KeyAgreement reject AlgorithmParameterSpec.
Add bouncycastle-nojarjar for building okhttp-tests

Change-Id: Id8cfb06440d6d39e7374aa73d8b5b8991d4d45d5
Merge "Add bouncycastle-nojarjar for building okhttp-tests"
resolved conflicts for merge of bc044035 to jb-mr2-dev-plus-aosp

Change-Id: I84b64f377d0bb1503884ec83e88680569c26ef71
am c7d0f2f2: resolved conflicts for merge of bc044035 to jb-mr2-dev-plus-aosp

* commit 'c7d0f2f2c5d6a9ed99c1c4ee182dbf57b28830ae':
  Add bouncycastle-nojarjar for building okhttp-tests
Make bouncycastle-nojarjar static to keep it off the device

Change-Id: I02c3b467e16c10a2259ba75932291029a1804579
Merge "Make bouncycastle-nojarjar static to keep it off the device"
am 7d18f46a: Merge "Make bouncycastle-nojarjar static to keep it off the device"

* commit '7d18f46ad1dc37e346d5eaf896bc6f2319cee728':
  Make bouncycastle-nojarjar static to keep it off the device
am 7ba35979: am 7d18f46a: Merge "Make bouncycastle-nojarjar static to keep it off the device"

* commit '7ba359793513a5fc3a72fa515acd247b1bf0338f':
  Make bouncycastle-nojarjar static to keep it off the device
Fix PBKDF2WithHmacSHA1 to use high bits

Bug: 8312059
Bug: https://code.google.com/p/android/issues/detail?id=40578
Change-Id: I741f2d77604bfd3235e59a1bca65342f13d248d6
Revert of DERT61String change from 44021512997b337e6079e46fd4230ce979c20b6f

Bug: 8685209
Change-Id: I72865d6db1ff567da4b24566fa3878053819f826
Merge "Revert of DERT61String change from 44021512997b337e6079e46fd4230ce979c20b6f"
am 13a304fc: Merge "Revert of DERT61String change from 44021512997b337e6079e46fd4230ce979c20b6f"

* commit '13a304fc33c5d9fbee0b6da3a2f53ee3284c91bf':
  Revert of DERT61String change from 44021512997b337e6079e46fd4230ce979c20b6f
am 28f0a517: am 13a304fc: Merge "Revert of DERT61String change from 44021512997b337e6079e46fd4230ce979c20b6f"

* commit '28f0a517d4c7235244e50261ecd594268e46a61b':
  Revert of DERT61String change from 44021512997b337e6079e46fd4230ce979c20b6f
am 57c3bb55: Revert of DERT61String change from 44021512997b337e6079e46fd4230ce979c20b6f

* commit '57c3bb556ef873a72010d6022edddc14e6bba9be':
  Revert of DERT61String change from 44021512997b337e6079e46fd4230ce979c20b6f
am 89f64f30: am 57c3bb55: Revert of DERT61String change from 44021512997b337e6079e46fd4230ce979c20b6f

* commit '89f64f3064d872878f33833af9f47bab27ca15b7':
  Revert of DERT61String change from 44021512997b337e6079e46fd4230ce979c20b6f
Merge "Fix PBKDF2WithHmacSHA1 to use high bits"
Track change to JSSE provider

Change-Id: Iaef3e3f325e43736fa19c701f6609e5ffd1535fa
Merge "Track change to JSSE provider"