commit 249d45959a6c4e3f291a9d43e8953cf6740df50d
author Adam Langley <agl@google.com> Mon Apr 06 22:13:40 2015
committer Adam Langley <agl@google.com> Mon Apr 06 22:14:57 2015
tree 56d2558d5b0c7012655dd0a62cc6a830a1165344
parent f2ddea1f97d8d19c46fd1e4d692fa0d5f97dd433

Fix up merge in r317474.

I got my gyp flags in a tangle and thought that I was building and
testing use_openssl=1 when I wasn't. The original merged change pulled
in a lot more BoringSSL changes than were merged to the BoringSSL 2311
branch and included build changes that don't work on the branch.

Also, fix a couple of tests that don't exist on trunk any longer.

BUG=474254

Cr-Commit-Position: refs/branch-heads/2311@{#435}
Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}