Revert "Revert "Add keymaster VTS tests.""
am: 63e15f0790

Change-Id: Ic93a1b3587a0d8edbdc13ca4a831b77ce75d8b14