am d247aa8c: am 351f28e2: Merge "Load crypto plugins from additional shared libraries" into jb-mr2-dev

* commit 'd247aa8cec243a0a49a44057749820149e826d1a':
  Load crypto plugins from additional shared libraries