Merge "Add libtrusty to recovery image"