Merge "Revert "Update tests for BoringSSL roll.""