Merge "Revert "Add keymaster VTS tests."" into oc-dev am: bf0f670580
am: 700c418e8b

Change-Id: I5a7d4a7f1685fb1815a98e3569d2c7dabf6609ef