Merge "Expose libacvp_modulewrapper to Trusty ACVP modulewrapper"