Merge "Provide VINTF for Trusty Keymaster"
am: dfad089dad

Change-Id: I9d959d91e75935675010de6689db5dd8dc379b25