am 6555a64f: am 4d572b01: Merge "Load crypto plugins from additional shared...
am 6555a64f: am 4d572b01: Merge "Load crypto plugins from additional shared libraries" into jb-mr2-dev
* commit '6555a64f':
Load crypto plugins from additional shared libraries