Merge "Revert "Add libtrusty and corresponding test utility""