(Imported from 950d49d43900e67a1f9d02bc1a053a9fdc5c4257.) Change-Id: Ia41c5076019b8cb16a9af9247b947fba7b20e87a Reviewed-on: https://boringssl-review.googlesource.com/22725 Reviewed-by: Steven Valdez <svaldez@google.com> Commit-Queue: David Benjamin <davidben@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>kris/onging/CECPQ3_patch15