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

Change-Id: I3b9fd3a60c6c1d0c1f770e1f203b25ad23e511cc