Merge "Trusty: Add BoringSSL modulewrapper for ACVP" am: b0f77dfe3b am: fe45e3a642

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1587599

Change-Id: I1573efdfdec973fab2eabee8c6e8488c9f3bb216