Merge "Fix Keymaster VTS for OpenSSL error code change" am: fc23356909
am: f9fceff665

Change-Id: I31e9a6f5da3e894287dbb76d94b766e236767a63