Merge "Provide VINTF for Trusty Keymaster"