There seems to have been a merge error. Change-Id: I72e5c2a45c148e31c90b28bedfff48f8ca6e3c8c Reviewed-on: https://boringssl-review.googlesource.com/6455 Reviewed-by: Adam Langley <agl@google.com>