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