Merge "trusty: Avoid unnecessary use of static libtrusty"