Merge "trusty: Avoid unnecessary use of static libtrusty"
am: 52ca777e57

Change-Id: I41d66c359efaccf16ec1c86028ec5081f2b53553