Merge "trusty: keymaster: Remove legacy support" am: 23ba0d425e

Change-Id: I1f37917b3e58864a6630d0804426df81940df866