Merge "Provide VINTF for Trusty Keymaster" am: dfad089dad
am: 7f6c6dc1e2

Change-Id: I635fdf260e2ff9092f45e065dd814a739a4b41f2