Merge "trusty: keymaster: Remove legacy support"