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

Change-Id: I28bfff5b7e2a1109d32f43a84cfa362562c13bd5