Merge "Add Keymaster VTS tests for some AES cases:"