Merge "Revert "external/boringssl: sync with upstream.""