Merge "Fix Keymaster VTS for OpenSSL error code change"